From f64cca531d3de8a78beb0b1723be2f83fe124838 Mon Sep 17 00:00:00 2001
From: Stefan Herrnleben <s.herrnleben@syslex.de>
Date: Thu, 27 Jul 2017 11:48:30 +0200
Subject: [PATCH] suppress emf types in meta models
---
.../model/DNIMM3AP.xcore | 2 +-
.../descartes/dni/dnimm3ap/AdaptableLink.java | 7 +++----
.../dnimm3ap/AdaptableNetworkInterface.java | 5 ++---
.../descartes/dni/dnimm3ap/AdaptableNode.java | 11 +++++------
.../dnimm3ap/AdaptableSdnNodePerformance.java | 7 +++----
.../dni/dnimm3ap/AdaptationGroups.java | 7 +++----
.../dni/dnimm3ap/AdaptationRepositories.java | 19 +++++++++----------
.../dni/dnimm3ap/AlternativeParameterSet.java | 5 ++---
.../descartes/dni/dnimm3ap/DNIAPPackage.java | 2 +-
.../dni/dnimm3ap/LinkAdaptationGroup.java | 4 ++--
.../dni/dnimm3ap/NodeAdaptationGroup.java | 4 ++--
.../dni/dnimm3ap/impl/AdaptableLinkImpl.java | 5 +++--
.../impl/AdaptableNetworkInterfaceImpl.java | 3 ++-
.../dni/dnimm3ap/impl/AdaptableNodeImpl.java | 9 +++++----
.../impl/AdaptableSdnNodePerformanceImpl.java | 5 +++--
.../dnimm3ap/impl/AdaptationGroupsImpl.java | 5 +++--
.../impl/AdaptationRepositoriesImpl.java | 17 +++++++++--------
...lternativeConstantLongVariableSetImpl.java | 3 ++-
.../impl/AlternativeVariableSetImpl.java | 3 ++-
.../impl/LinkAdaptationGroupImpl.java | 3 ++-
.../impl/NodeAdaptationGroupImpl.java | 3 ++-
tools.descartes.dni.core/model/DNIMM3.xcore | 2 +-
.../dni/dnimm3/AddressableEntity.java | 5 ++---
.../descartes/dni/dnimm3/BranchAction.java | 4 ++--
.../dni/dnimm3/CommunicatingApplication.java | 4 ++--
.../descartes/dni/dnimm3/DNIPackage.java | 2 +-
.../dni/dnimm3/DiscreteFunction.java | 4 ++--
.../src/tools/descartes/dni/dnimm3/End.java | 4 ++--
.../dni/dnimm3/EndPerformanceType.java | 4 ++--
.../descartes/dni/dnimm3/EntityTypes.java | 5 ++---
.../src/tools/descartes/dni/dnimm3/Flow.java | 8 ++++----
.../descartes/dni/dnimm3/GenericWorkload.java | 4 ++--
.../dnimm3/IntermediatePerformanceType.java | 4 ++--
.../src/tools/descartes/dni/dnimm3/Link.java | 4 ++--
.../dni/dnimm3/LinkPerformanceType.java | 4 ++--
.../tools/descartes/dni/dnimm3/LinkType.java | 4 ++--
.../dni/dnimm3/NetworkConfiguration.java | 5 ++---
.../NetworkInterfacePerformanceType.java | 4 ++--
.../dni/dnimm3/NetworkInterfaceType.java | 4 ++--
.../dni/dnimm3/NetworkStructure.java | 7 +++----
.../descartes/dni/dnimm3/NetworkTraffic.java | 7 +++----
.../src/tools/descartes/dni/dnimm3/Node.java | 6 +++---
.../tools/descartes/dni/dnimm3/NodeType.java | 4 ++--
.../descartes/dni/dnimm3/ProtocolStack.java | 4 ++--
.../dni/dnimm3/ProtocolsRepository.java | 7 +++----
.../dni/dnimm3/RoutesRepository.java | 9 ++++-----
.../src/tools/descartes/dni/dnimm3/SDN.java | 4 ++--
.../descartes/dni/dnimm3/SdnController.java | 6 +++---
.../dni/dnimm3/SdnNodePerformanceType.java | 4 ++--
.../descartes/dni/dnimm3/SequenceAction.java | 4 ++--
.../descartes/dni/dnimm3/TrafficSource.java | 4 ++--
.../dni/dnimm3/impl/BranchActionImpl.java | 3 ++-
.../impl/CommunicatingApplicationImpl.java | 3 ++-
.../dni/dnimm3/impl/DiscreteFunctionImpl.java | 3 ++-
.../descartes/dni/dnimm3/impl/EndImpl.java | 3 ++-
.../dnimm3/impl/EndPerformanceTypeImpl.java | 3 ++-
.../dni/dnimm3/impl/EntityTypesImpl.java | 3 ++-
.../descartes/dni/dnimm3/impl/FlowImpl.java | 7 ++++---
.../dni/dnimm3/impl/GenericWorkloadImpl.java | 3 ++-
.../impl/IntermediatePerformanceTypeImpl.java | 3 ++-
.../descartes/dni/dnimm3/impl/LinkImpl.java | 3 ++-
.../dnimm3/impl/LinkPerformanceTypeImpl.java | 3 ++-
.../dni/dnimm3/impl/LinkTypeImpl.java | 3 ++-
.../dnimm3/impl/NetworkConfigurationImpl.java | 3 ++-
.../dni/dnimm3/impl/NetworkInterfaceImpl.java | 3 ++-
.../NetworkInterfacePerformanceTypeImpl.java | 3 ++-
.../dnimm3/impl/NetworkInterfaceTypeImpl.java | 3 ++-
.../dni/dnimm3/impl/NetworkStructureImpl.java | 5 +++--
.../dni/dnimm3/impl/NetworkTrafficImpl.java | 5 +++--
.../descartes/dni/dnimm3/impl/NodeImpl.java | 5 +++--
.../dni/dnimm3/impl/NodeTypeImpl.java | 3 ++-
.../dni/dnimm3/impl/ProtocolStackImpl.java | 3 ++-
.../dnimm3/impl/ProtocolsRepositoryImpl.java | 5 +++--
.../dni/dnimm3/impl/RoutesRepositoryImpl.java | 7 ++++---
.../descartes/dni/dnimm3/impl/SDNImpl.java | 3 ++-
.../dni/dnimm3/impl/SdnControllerImpl.java | 5 +++--
.../impl/SdnNodePerformanceTypeImpl.java | 3 ++-
.../dni/dnimm3/impl/SequenceActionImpl.java | 3 ++-
.../dni/dnimm3/impl/TrafficSourceImpl.java | 5 +++--
79 files changed, 199 insertions(+), 175 deletions(-)
diff --git a/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore b/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore
index e4f4039b..203e73e9 100644
--- a/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore
+++ b/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore
@@ -1,6 +1,6 @@
@Ecore(nsURI="http://descartes.tools/dni-adaptation-metamodel-3.1")
@GenModel(modelDirectory="/tools.descartes.dni.adaptation/src", editDirectory="/tools.descartes.dni.adaptation/src",
- editorDirectory="/tools.descartes.dni.adaptation/src", fileExtensions="dniap", prefix="DNIAP")
+ editorDirectory="/tools.descartes.dni.adaptation/src", fileExtensions="dniap", prefix="DNIAP", suppressEMFTypes="true")
package tools.descartes.dni.dnimm3ap
//
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLink.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLink.java
index 18b4e2ff..1da2d830 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLink.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLink.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3ap;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import tools.descartes.dni.dnimm3.LinkType;
/**
@@ -56,7 +55,7 @@ public interface AdaptableLink extends IAdaptableEntity<LinkType>, IAdaptableGro
* @model
* @generated
*/
- EList<AdaptableLinkPerformance> getLinkPerformance();
+ List<AdaptableLinkPerformance> getLinkPerformance();
/**
* Returns the value of the '<em><b>Network Interface</b></em>' reference list.
@@ -72,7 +71,7 @@ public interface AdaptableLink extends IAdaptableEntity<LinkType>, IAdaptableGro
* @model
* @generated
*/
- EList<AdaptableNetworkInterface> getNetworkInterface();
+ List<AdaptableNetworkInterface> getNetworkInterface();
/**
* Returns the value of the '<em><b>Adaptation Group</b></em>' reference.
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterface.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterface.java
index 192cd04f..b4a1b7c5 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterface.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterface.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3ap;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import tools.descartes.dni.dnimm3.NetworkInterfaceType;
/**
@@ -54,6 +53,6 @@ public interface AdaptableNetworkInterface extends IAdaptableEntity<NetworkInter
* @model
* @generated
*/
- EList<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformance();
+ List<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformance();
} // AdaptableNetworkInterface
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNode.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNode.java
index 79eb436d..6db96747 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNode.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNode.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3ap;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import tools.descartes.dni.dnimm3.NodeType;
/**
@@ -58,7 +57,7 @@ public interface AdaptableNode extends IAdaptableEntity<NodeType>, IAdaptableGro
* @model
* @generated
*/
- EList<AdaptableEndPerformance> getEndPerformance();
+ List<AdaptableEndPerformance> getEndPerformance();
/**
* Returns the value of the '<em><b>Intermediate Performance</b></em>' reference list.
@@ -74,7 +73,7 @@ public interface AdaptableNode extends IAdaptableEntity<NodeType>, IAdaptableGro
* @model
* @generated
*/
- EList<AdaptableIntermediatePerformance> getIntermediatePerformance();
+ List<AdaptableIntermediatePerformance> getIntermediatePerformance();
/**
* Returns the value of the '<em><b>Sdn Node Performance</b></em>' reference list.
@@ -90,7 +89,7 @@ public interface AdaptableNode extends IAdaptableEntity<NodeType>, IAdaptableGro
* @model
* @generated
*/
- EList<AdaptableSdnNodePerformance> getSdnNodePerformance();
+ List<AdaptableSdnNodePerformance> getSdnNodePerformance();
/**
* Returns the value of the '<em><b>Network Interface</b></em>' reference list.
@@ -106,7 +105,7 @@ public interface AdaptableNode extends IAdaptableEntity<NodeType>, IAdaptableGro
* @model
* @generated
*/
- EList<AdaptableNetworkInterface> getNetworkInterface();
+ List<AdaptableNetworkInterface> getNetworkInterface();
/**
* Returns the value of the '<em><b>Adaptation Group</b></em>' reference.
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformance.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformance.java
index e3e4a4c1..485f07f3 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformance.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformance.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3ap;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import tools.descartes.dni.dnimm3.SdnNodePerformanceType;
/**
@@ -55,7 +54,7 @@ public interface AdaptableSdnNodePerformance extends IAdaptableEntity<SdnNodePer
* @model
* @generated
*/
- EList<AdaptableIntermediatePerformance> getSoftwareSwitchingPerformance();
+ List<AdaptableIntermediatePerformance> getSoftwareSwitchingPerformance();
/**
* Returns the value of the '<em><b>Hardware Switching Performance</b></em>' reference list.
@@ -71,6 +70,6 @@ public interface AdaptableSdnNodePerformance extends IAdaptableEntity<SdnNodePer
* @model
* @generated
*/
- EList<AdaptableIntermediatePerformance> getHardwareSwitchingPerformance();
+ List<AdaptableIntermediatePerformance> getHardwareSwitchingPerformance();
} // AdaptableSdnNodePerformance
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationGroups.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationGroups.java
index cacb8523..a47f18fe 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationGroups.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationGroups.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3ap;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
/**
@@ -38,7 +37,7 @@ public interface AdaptationGroups extends EObject {
* @model containment="true"
* @generated
*/
- EList<NodeAdaptationGroup> getNodes();
+ List<NodeAdaptationGroup> getNodes();
/**
* Returns the value of the '<em><b>Links</b></em>' containment reference list.
@@ -54,6 +53,6 @@ public interface AdaptationGroups extends EObject {
* @model containment="true"
* @generated
*/
- EList<LinkAdaptationGroup> getLinks();
+ List<LinkAdaptationGroup> getLinks();
} // AdaptationGroups
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationRepositories.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationRepositories.java
index 9c7d46bf..0edbded9 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationRepositories.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationRepositories.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3ap;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
/**
@@ -44,7 +43,7 @@ public interface AdaptationRepositories extends EObject {
* @model containment="true"
* @generated
*/
- EList<AdaptableNode> getNodes();
+ List<AdaptableNode> getNodes();
/**
* Returns the value of the '<em><b>End Performances</b></em>' containment reference list.
@@ -60,7 +59,7 @@ public interface AdaptationRepositories extends EObject {
* @model containment="true"
* @generated
*/
- EList<AdaptableEndPerformance> getEndPerformances();
+ List<AdaptableEndPerformance> getEndPerformances();
/**
* Returns the value of the '<em><b>Intermediate Performances</b></em>' containment reference list.
@@ -76,7 +75,7 @@ public interface AdaptationRepositories extends EObject {
* @model containment="true"
* @generated
*/
- EList<AdaptableIntermediatePerformance> getIntermediatePerformances();
+ List<AdaptableIntermediatePerformance> getIntermediatePerformances();
/**
* Returns the value of the '<em><b>Sdn Node Performances</b></em>' containment reference list.
@@ -92,7 +91,7 @@ public interface AdaptationRepositories extends EObject {
* @model containment="true"
* @generated
*/
- EList<AdaptableSdnNodePerformance> getSdnNodePerformances();
+ List<AdaptableSdnNodePerformance> getSdnNodePerformances();
/**
* Returns the value of the '<em><b>Network Interfaces</b></em>' containment reference list.
@@ -108,7 +107,7 @@ public interface AdaptationRepositories extends EObject {
* @model containment="true"
* @generated
*/
- EList<AdaptableNetworkInterface> getNetworkInterfaces();
+ List<AdaptableNetworkInterface> getNetworkInterfaces();
/**
* Returns the value of the '<em><b>Network Interface Performances</b></em>' containment reference list.
@@ -124,7 +123,7 @@ public interface AdaptationRepositories extends EObject {
* @model containment="true"
* @generated
*/
- EList<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformances();
+ List<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformances();
/**
* Returns the value of the '<em><b>Links</b></em>' containment reference list.
@@ -140,7 +139,7 @@ public interface AdaptationRepositories extends EObject {
* @model containment="true"
* @generated
*/
- EList<AdaptableLink> getLinks();
+ List<AdaptableLink> getLinks();
/**
* Returns the value of the '<em><b>Link Performances</b></em>' containment reference list.
@@ -156,6 +155,6 @@ public interface AdaptationRepositories extends EObject {
* @model containment="true"
* @generated
*/
- EList<AdaptableLinkPerformance> getLinkPerformances();
+ List<AdaptableLinkPerformance> getLinkPerformances();
} // AdaptationRepositories
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeParameterSet.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeParameterSet.java
index e73ddfe6..20ae3940 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeParameterSet.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeParameterSet.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3ap;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
/**
@@ -36,6 +35,6 @@ public interface AlternativeParameterSet<P> extends EObject {
* @model kind="reference" containment="true"
* @generated
*/
- EList<P> getAlternative();
+ List<P> getAlternative();
} // AlternativeParameterSet
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/DNIAPPackage.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/DNIAPPackage.java
index 6372f150..5eee0477 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/DNIAPPackage.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/DNIAPPackage.java
@@ -23,7 +23,7 @@ import tools.descartes.dni.dnimm3.DNIPackage;
* <!-- end-user-doc -->
* @see tools.descartes.dni.dnimm3ap.DNIAPFactory
* @model kind="package"
- * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/tools.descartes.dni.adaptation/src' editDirectory='/tools.descartes.dni.adaptation/src' editorDirectory='/tools.descartes.dni.adaptation/src' fileExtensions='dniap' prefix='DNIAP' basePackage='tools.descartes.dni'"
+ * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/tools.descartes.dni.adaptation/src' editDirectory='/tools.descartes.dni.adaptation/src' editorDirectory='/tools.descartes.dni.adaptation/src' fileExtensions='dniap' prefix='DNIAP' suppressEMFTypes='true' basePackage='tools.descartes.dni'"
* @generated
*/
public interface DNIAPPackage extends EPackage {
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/LinkAdaptationGroup.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/LinkAdaptationGroup.java
index 6d5fb042..4639d541 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/LinkAdaptationGroup.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/LinkAdaptationGroup.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3ap;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface LinkAdaptationGroup extends IAdaptationGroup {
* @model opposite="adaptationGroup"
* @generated
*/
- EList<AdaptableLink> getItems();
+ List<AdaptableLink> getItems();
} // LinkAdaptationGroup
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/NodeAdaptationGroup.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/NodeAdaptationGroup.java
index df73a073..1b27be48 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/NodeAdaptationGroup.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/NodeAdaptationGroup.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3ap;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface NodeAdaptationGroup extends IAdaptationGroup {
* @model opposite="adaptationGroup"
* @generated
*/
- EList<AdaptableNode> getItems();
+ List<AdaptableNode> getItems();
} // NodeAdaptationGroup
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java
index 0cddc622..7762c9d6 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -171,7 +172,7 @@ public class AdaptableLinkImpl extends MinimalEObjectImpl.Container implements A
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableLinkPerformance> getLinkPerformance() {
+ public List<AdaptableLinkPerformance> getLinkPerformance() {
if (linkPerformance == null) {
linkPerformance = new EObjectResolvingEList<AdaptableLinkPerformance>(AdaptableLinkPerformance.class, this, DNIAPPackage.ADAPTABLE_LINK__LINK_PERFORMANCE);
}
@@ -183,7 +184,7 @@ public class AdaptableLinkImpl extends MinimalEObjectImpl.Container implements A
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableNetworkInterface> getNetworkInterface() {
+ public List<AdaptableNetworkInterface> getNetworkInterface() {
if (networkInterface == null) {
networkInterface = new EObjectResolvingEList<AdaptableNetworkInterface>(AdaptableNetworkInterface.class, this, DNIAPPackage.ADAPTABLE_LINK__NETWORK_INTERFACE);
}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java
index ecca8e0e..db78d7e9 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.EList;
@@ -146,7 +147,7 @@ public class AdaptableNetworkInterfaceImpl extends MinimalEObjectImpl.Container
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformance() {
+ public List<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformance() {
if (networkInterfacePerformance == null) {
networkInterfacePerformance = new EObjectResolvingEList<AdaptableNetworkInterfacePerformance>(AdaptableNetworkInterfacePerformance.class, this, DNIAPPackage.ADAPTABLE_NETWORK_INTERFACE__NETWORK_INTERFACE_PERFORMANCE);
}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java
index 033ca0c6..e7e0a4bc 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -195,7 +196,7 @@ public class AdaptableNodeImpl extends MinimalEObjectImpl.Container implements A
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableEndPerformance> getEndPerformance() {
+ public List<AdaptableEndPerformance> getEndPerformance() {
if (endPerformance == null) {
endPerformance = new EObjectResolvingEList<AdaptableEndPerformance>(AdaptableEndPerformance.class, this, DNIAPPackage.ADAPTABLE_NODE__END_PERFORMANCE);
}
@@ -207,7 +208,7 @@ public class AdaptableNodeImpl extends MinimalEObjectImpl.Container implements A
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableIntermediatePerformance> getIntermediatePerformance() {
+ public List<AdaptableIntermediatePerformance> getIntermediatePerformance() {
if (intermediatePerformance == null) {
intermediatePerformance = new EObjectResolvingEList<AdaptableIntermediatePerformance>(AdaptableIntermediatePerformance.class, this, DNIAPPackage.ADAPTABLE_NODE__INTERMEDIATE_PERFORMANCE);
}
@@ -219,7 +220,7 @@ public class AdaptableNodeImpl extends MinimalEObjectImpl.Container implements A
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableSdnNodePerformance> getSdnNodePerformance() {
+ public List<AdaptableSdnNodePerformance> getSdnNodePerformance() {
if (sdnNodePerformance == null) {
sdnNodePerformance = new EObjectResolvingEList<AdaptableSdnNodePerformance>(AdaptableSdnNodePerformance.class, this, DNIAPPackage.ADAPTABLE_NODE__SDN_NODE_PERFORMANCE);
}
@@ -231,7 +232,7 @@ public class AdaptableNodeImpl extends MinimalEObjectImpl.Container implements A
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableNetworkInterface> getNetworkInterface() {
+ public List<AdaptableNetworkInterface> getNetworkInterface() {
if (networkInterface == null) {
networkInterface = new EObjectResolvingEList<AdaptableNetworkInterface>(AdaptableNetworkInterface.class, this, DNIAPPackage.ADAPTABLE_NODE__NETWORK_INTERFACE);
}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java
index cb540eb2..210835a7 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.EList;
@@ -157,7 +158,7 @@ public class AdaptableSdnNodePerformanceImpl extends MinimalEObjectImpl.Containe
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableIntermediatePerformance> getSoftwareSwitchingPerformance() {
+ public List<AdaptableIntermediatePerformance> getSoftwareSwitchingPerformance() {
if (softwareSwitchingPerformance == null) {
softwareSwitchingPerformance = new EObjectResolvingEList<AdaptableIntermediatePerformance>(AdaptableIntermediatePerformance.class, this, DNIAPPackage.ADAPTABLE_SDN_NODE_PERFORMANCE__SOFTWARE_SWITCHING_PERFORMANCE);
}
@@ -169,7 +170,7 @@ public class AdaptableSdnNodePerformanceImpl extends MinimalEObjectImpl.Containe
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableIntermediatePerformance> getHardwareSwitchingPerformance() {
+ public List<AdaptableIntermediatePerformance> getHardwareSwitchingPerformance() {
if (hardwareSwitchingPerformance == null) {
hardwareSwitchingPerformance = new EObjectResolvingEList<AdaptableIntermediatePerformance>(AdaptableIntermediatePerformance.class, this, DNIAPPackage.ADAPTABLE_SDN_NODE_PERFORMANCE__HARDWARE_SWITCHING_PERFORMANCE);
}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationGroupsImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationGroupsImpl.java
index d0886fdc..0ea709ca 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationGroupsImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationGroupsImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -80,7 +81,7 @@ public class AdaptationGroupsImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
- public EList<NodeAdaptationGroup> getNodes() {
+ public List<NodeAdaptationGroup> getNodes() {
if (nodes == null) {
nodes = new EObjectContainmentEList<NodeAdaptationGroup>(NodeAdaptationGroup.class, this, DNIAPPackage.ADAPTATION_GROUPS__NODES);
}
@@ -92,7 +93,7 @@ public class AdaptationGroupsImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
- public EList<LinkAdaptationGroup> getLinks() {
+ public List<LinkAdaptationGroup> getLinks() {
if (links == null) {
links = new EObjectContainmentEList<LinkAdaptationGroup>(LinkAdaptationGroup.class, this, DNIAPPackage.ADAPTATION_GROUPS__LINKS);
}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java
index b607f7fb..b40748cb 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -152,7 +153,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableNode> getNodes() {
+ public List<AdaptableNode> getNodes() {
if (nodes == null) {
nodes = new EObjectContainmentEList<AdaptableNode>(AdaptableNode.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__NODES);
}
@@ -164,7 +165,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableEndPerformance> getEndPerformances() {
+ public List<AdaptableEndPerformance> getEndPerformances() {
if (endPerformances == null) {
endPerformances = new EObjectContainmentEList<AdaptableEndPerformance>(AdaptableEndPerformance.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__END_PERFORMANCES);
}
@@ -176,7 +177,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableIntermediatePerformance> getIntermediatePerformances() {
+ public List<AdaptableIntermediatePerformance> getIntermediatePerformances() {
if (intermediatePerformances == null) {
intermediatePerformances = new EObjectContainmentEList<AdaptableIntermediatePerformance>(AdaptableIntermediatePerformance.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__INTERMEDIATE_PERFORMANCES);
}
@@ -188,7 +189,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableSdnNodePerformance> getSdnNodePerformances() {
+ public List<AdaptableSdnNodePerformance> getSdnNodePerformances() {
if (sdnNodePerformances == null) {
sdnNodePerformances = new EObjectContainmentEList<AdaptableSdnNodePerformance>(AdaptableSdnNodePerformance.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__SDN_NODE_PERFORMANCES);
}
@@ -200,7 +201,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableNetworkInterface> getNetworkInterfaces() {
+ public List<AdaptableNetworkInterface> getNetworkInterfaces() {
if (networkInterfaces == null) {
networkInterfaces = new EObjectContainmentEList<AdaptableNetworkInterface>(AdaptableNetworkInterface.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__NETWORK_INTERFACES);
}
@@ -212,7 +213,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformances() {
+ public List<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformances() {
if (networkInterfacePerformances == null) {
networkInterfacePerformances = new EObjectContainmentEList<AdaptableNetworkInterfacePerformance>(AdaptableNetworkInterfacePerformance.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__NETWORK_INTERFACE_PERFORMANCES);
}
@@ -224,7 +225,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableLink> getLinks() {
+ public List<AdaptableLink> getLinks() {
if (links == null) {
links = new EObjectContainmentEList<AdaptableLink>(AdaptableLink.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__LINKS);
}
@@ -236,7 +237,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableLinkPerformance> getLinkPerformances() {
+ public List<AdaptableLinkPerformance> getLinkPerformances() {
if (linkPerformances == null) {
linkPerformances = new EObjectContainmentEList<AdaptableLinkPerformance>(AdaptableLinkPerformance.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__LINK_PERFORMANCES);
}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongVariableSetImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongVariableSetImpl.java
index 1d2db3fd..cc82de23 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongVariableSetImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongVariableSetImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -68,7 +69,7 @@ public class AlternativeConstantLongVariableSetImpl extends AlternativeConstantL
* <!-- end-user-doc -->
* @generated
*/
- public EList<ConstantLongVariable> getAlternative() {
+ public List<ConstantLongVariable> getAlternative() {
if (alternative == null) {
alternative = new EObjectContainmentEList<ConstantLongVariable>(ConstantLongVariable.class, this, DNIAPPackage.ALTERNATIVE_CONSTANT_LONG_VARIABLE_SET__ALTERNATIVE);
}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableSetImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableSetImpl.java
index 6d0d4683..4e9c13fa 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableSetImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableSetImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -68,7 +69,7 @@ public class AlternativeVariableSetImpl extends AlternativeVariableImpl implemen
* <!-- end-user-doc -->
* @generated
*/
- public EList<Variable> getAlternative() {
+ public List<Variable> getAlternative() {
if (alternative == null) {
alternative = new EObjectContainmentEList<Variable>(Variable.class, this, DNIAPPackage.ALTERNATIVE_VARIABLE_SET__ALTERNATIVE);
}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java
index aeb52b28..19851e8d 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -256,7 +257,7 @@ public class LinkAdaptationGroupImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableLink> getItems() {
+ public List<AdaptableLink> getItems() {
if (items == null) {
items = new EObjectWithInverseResolvingEList<AdaptableLink>(AdaptableLink.class, this, DNIAPPackage.LINK_ADAPTATION_GROUP__ITEMS, DNIAPPackage.ADAPTABLE_LINK__ADAPTATION_GROUP);
}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java
index 2e817c00..b978a654 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -256,7 +257,7 @@ public class NodeAdaptationGroupImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
- public EList<AdaptableNode> getItems() {
+ public List<AdaptableNode> getItems() {
if (items == null) {
items = new EObjectWithInverseResolvingEList<AdaptableNode>(AdaptableNode.class, this, DNIAPPackage.NODE_ADAPTATION_GROUP__ITEMS, DNIAPPackage.ADAPTABLE_NODE__ADAPTATION_GROUP);
}
diff --git a/tools.descartes.dni.core/model/DNIMM3.xcore b/tools.descartes.dni.core/model/DNIMM3.xcore
index b5d9a878..39440a71 100644
--- a/tools.descartes.dni.core/model/DNIMM3.xcore
+++ b/tools.descartes.dni.core/model/DNIMM3.xcore
@@ -3,7 +3,7 @@
settingDelegates="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
validationDelegates="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot")
@GenModel(modelDirectory="/tools.descartes.dni.core/src", editDirectory="/tools.descartes.dni.core/src",
- editorDirectory="/tools.descartes.dni.core/src", fileExtensions="dni", prefix="DNI")
+ editorDirectory="/tools.descartes.dni.core/src", fileExtensions="dni", prefix="DNI", suppressEMFTypes="true")
package tools.descartes.dni.dnimm3
import org.eclipse.emf.ecore.util.EcoreUtil
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/AddressableEntity.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/AddressableEntity.java
index 857cd548..5e00c53a 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/AddressableEntity.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/AddressableEntity.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
/**
@@ -37,6 +36,6 @@ public interface AddressableEntity extends EObject {
* @model containment="true"
* @generated
*/
- EList<EntityAddress> getAddresses();
+ List<EntityAddress> getAddresses();
} // AddressableEntity
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/BranchAction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/BranchAction.java
index bf5d933b..9ec3261b 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/BranchAction.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/BranchAction.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -35,6 +35,6 @@ public interface BranchAction extends AbstractAction {
* @model containment="true" required="true"
* @generated
*/
- EList<AbstractAction> getIntern();
+ List<AbstractAction> getIntern();
} // BranchAction
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/CommunicatingApplication.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/CommunicatingApplication.java
index 8f6d1702..81be28ee 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/CommunicatingApplication.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/CommunicatingApplication.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -38,7 +38,7 @@ public interface CommunicatingApplication extends Entity {
* @model opposite="softwareComponent" containment="true"
* @generated
*/
- EList<TrafficSource> getTrafficSources();
+ List<TrafficSource> getTrafficSources();
/**
* Returns the value of the '<em><b>Deployed On</b></em>' reference.
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIPackage.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIPackage.java
index 56bfef33..b75ec467 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIPackage.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIPackage.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EReference;
* <!-- end-user-doc -->
* @see tools.descartes.dni.dnimm3.DNIFactory
* @model kind="package"
- * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/tools.descartes.dni.core/src' editDirectory='/tools.descartes.dni.core/src' editorDirectory='/tools.descartes.dni.core/src' fileExtensions='dni' prefix='DNI' basePackage='tools.descartes.dni'"
+ * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/tools.descartes.dni.core/src' editDirectory='/tools.descartes.dni.core/src' editorDirectory='/tools.descartes.dni.core/src' fileExtensions='dni' prefix='DNI' suppressEMFTypes='true' basePackage='tools.descartes.dni'"
* annotation="http://www.eclipse.org/emf/2011/Xcore Pivot='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"
* @generated
*/
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DiscreteFunction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DiscreteFunction.java
index 394be360..fb9a8f5f 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DiscreteFunction.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DiscreteFunction.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -35,6 +35,6 @@ public interface DiscreteFunction extends Function {
* @model containment="true" required="true"
* @generated
*/
- EList<FloatCoordinate> getVals();
+ List<FloatCoordinate> getVals();
} // DiscreteFunction
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/End.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/End.java
index 92d01d7b..35f61e50 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/End.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/End.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -66,7 +66,7 @@ public interface End extends Identifier {
* @model opposite="deployedOn"
* @generated
*/
- EList<CommunicatingApplication> getSoftware();
+ List<CommunicatingApplication> getSoftware();
/**
* Returns the value of the '<em><b>Node</b></em>' container reference.
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EndPerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EndPerformanceType.java
index 6e407f73..deb82ca5 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EndPerformanceType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EndPerformanceType.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface EndPerformanceType extends ITypedEntity {
* @model opposite="entityType"
* @generated
*/
- EList<EndPerformance> getEntities();
+ List<EndPerformance> getEntities();
} // EndPerformanceType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EntityTypes.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EntityTypes.java
index 97342324..d209a405 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EntityTypes.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EntityTypes.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
/**
@@ -37,6 +36,6 @@ public interface EntityTypes extends EObject {
* @model containment="true"
* @generated
*/
- EList<ITypedEntity> getTypes();
+ List<ITypedEntity> getTypes();
} // EntityTypes
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Flow.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Flow.java
index 1cb7b47b..cb2f1a69 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Flow.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Flow.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -66,7 +66,7 @@ public interface Flow extends Entity {
* @model opposite="flow" containment="true"
* @generated
*/
- EList<FlowTraffic> getGeneratedTraffic();
+ List<FlowTraffic> getGeneratedTraffic();
/**
* Returns the value of the '<em><b>Destination Software</b></em>' reference list.
@@ -82,7 +82,7 @@ public interface Flow extends Entity {
* @model required="true"
* @generated
*/
- EList<CommunicatingApplication> getDestinationSoftware();
+ List<CommunicatingApplication> getDestinationSoftware();
/**
* Returns the value of the '<em><b>Destination Addresses</b></em>' containment reference list.
@@ -98,6 +98,6 @@ public interface Flow extends Entity {
* @model containment="true"
* @generated
*/
- EList<EntityAddress> getDestinationAddresses();
+ List<EntityAddress> getDestinationAddresses();
} // Flow
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/GenericWorkload.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/GenericWorkload.java
index c5b4f69a..aaaec61a 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/GenericWorkload.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/GenericWorkload.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -35,6 +35,6 @@ public interface GenericWorkload extends Workload {
* @model containment="true" ordered="false"
* @generated
*/
- EList<AbstractAction> getActions();
+ List<AbstractAction> getActions();
} // GenericWorkload
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IntermediatePerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IntermediatePerformanceType.java
index 1eaef5e3..2ef11d90 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IntermediatePerformanceType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IntermediatePerformanceType.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface IntermediatePerformanceType extends ITypedEntity {
* @model opposite="entityType"
* @generated
*/
- EList<IntermediatePerformance> getEntities();
+ List<IntermediatePerformance> getEntities();
} // IntermediatePerformanceType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java
index 6423b977..2b90c05b 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -38,7 +38,7 @@ public interface Link extends Entity {
* @model lower="2" upper="2"
* @generated
*/
- EList<NetworkInterface> getConnects();
+ List<NetworkInterface> getConnects();
/**
* Returns the value of the '<em><b>Performance</b></em>' containment reference.
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkPerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkPerformanceType.java
index 0869b280..fe4c5ce6 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkPerformanceType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkPerformanceType.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface LinkPerformanceType extends ITypedEntity {
* @model opposite="entityType"
* @generated
*/
- EList<PerformanceLink> getEntities();
+ List<PerformanceLink> getEntities();
} // LinkPerformanceType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkType.java
index 197d850e..3f6339a8 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkType.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface LinkType extends ITypedEntity {
* @model opposite="entityType"
* @generated
*/
- EList<Link> getEntities();
+ List<Link> getEntities();
} // LinkType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkConfiguration.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkConfiguration.java
index d05c5770..ead65870 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkConfiguration.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkConfiguration.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
/**
@@ -91,6 +90,6 @@ public interface NetworkConfiguration extends EObject {
* @model containment="true"
* @generated
*/
- EList<SdnFlowRule> getRules();
+ List<SdnFlowRule> getRules();
} // NetworkConfiguration
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfacePerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfacePerformanceType.java
index eb155a61..cdde37d0 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfacePerformanceType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfacePerformanceType.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface NetworkInterfacePerformanceType extends ITypedEntity {
* @model opposite="entityType"
* @generated
*/
- EList<PerformanceNetworkInterface> getEntities();
+ List<PerformanceNetworkInterface> getEntities();
} // NetworkInterfacePerformanceType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfaceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfaceType.java
index c79645a9..6e55ae2d 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfaceType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfaceType.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface NetworkInterfaceType extends ITypedEntity {
* @model opposite="entityType"
* @generated
*/
- EList<NetworkInterface> getEntities();
+ List<NetworkInterface> getEntities();
} // NetworkInterfaceType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkStructure.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkStructure.java
index 0934a622..05bf582d 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkStructure.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkStructure.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
/**
@@ -38,7 +37,7 @@ public interface NetworkStructure extends EObject {
* @model containment="true" required="true"
* @generated
*/
- EList<Node> getNodes();
+ List<Node> getNodes();
/**
* Returns the value of the '<em><b>Links</b></em>' containment reference list.
@@ -54,6 +53,6 @@ public interface NetworkStructure extends EObject {
* @model containment="true"
* @generated
*/
- EList<Link> getLinks();
+ List<Link> getLinks();
} // NetworkStructure
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkTraffic.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkTraffic.java
index d94cc9a6..45479b6a 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkTraffic.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkTraffic.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
/**
@@ -38,7 +37,7 @@ public interface NetworkTraffic extends EObject {
* @model containment="true"
* @generated
*/
- EList<Flow> getFlows();
+ List<Flow> getFlows();
/**
* Returns the value of the '<em><b>Software</b></em>' containment reference list.
@@ -54,6 +53,6 @@ public interface NetworkTraffic extends EObject {
* @model containment="true"
* @generated
*/
- EList<CommunicatingApplication> getSoftware();
+ List<CommunicatingApplication> getSoftware();
} // NetworkTraffic
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Node.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Node.java
index 431d1a0e..b64939af 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Node.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Node.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -45,7 +45,7 @@ public interface Node extends Entity {
* @model opposite="node" containment="true"
* @generated
*/
- EList<NetworkInterface> getInterfaces();
+ List<NetworkInterface> getInterfaces();
/**
* Returns the value of the '<em><b>Sdntype</b></em>' containment reference.
@@ -159,7 +159,7 @@ public interface Node extends Entity {
* @model opposite="isHostedOn"
* @generated
*/
- EList<Node> getHosts();
+ List<Node> getHosts();
/**
* Returns the value of the '<em><b>Is Hosted On</b></em>' reference.
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NodeType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NodeType.java
index feaaebc1..4f54bd3d 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NodeType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NodeType.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface NodeType extends ITypedEntity {
* @model opposite="entityType"
* @generated
*/
- EList<Node> getEntities();
+ List<Node> getEntities();
} // NodeType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolStack.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolStack.java
index c7e30044..0148ea20 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolStack.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolStack.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -35,6 +35,6 @@ public interface ProtocolStack extends Entity {
* @model containment="true" required="true"
* @generated
*/
- EList<ProtocolLayer> getLayers();
+ List<ProtocolLayer> getLayers();
} // ProtocolStack
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolsRepository.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolsRepository.java
index 8fdd8ed6..d9bf2c7a 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolsRepository.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolsRepository.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
/**
@@ -38,7 +37,7 @@ public interface ProtocolsRepository extends EObject {
* @model containment="true"
* @generated
*/
- EList<ProtocolStack> getStacks();
+ List<ProtocolStack> getStacks();
/**
* Returns the value of the '<em><b>Protocols</b></em>' containment reference list.
@@ -54,6 +53,6 @@ public interface ProtocolsRepository extends EObject {
* @model containment="true" required="true"
* @generated
*/
- EList<NetworkProtocol> getProtocols();
+ List<NetworkProtocol> getProtocols();
} // ProtocolsRepository
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/RoutesRepository.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/RoutesRepository.java
index 52ab1bcd..a8487a39 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/RoutesRepository.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/RoutesRepository.java
@@ -2,8 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
/**
@@ -39,7 +38,7 @@ public interface RoutesRepository extends EObject {
* @model containment="true"
* @generated
*/
- EList<Route> getRoutes();
+ List<Route> getRoutes();
/**
* Returns the value of the '<em><b>Flow Routes</b></em>' containment reference list.
@@ -55,7 +54,7 @@ public interface RoutesRepository extends EObject {
* @model containment="true"
* @generated
*/
- EList<FlowRoute> getFlowRoutes();
+ List<FlowRoute> getFlowRoutes();
/**
* Returns the value of the '<em><b>Directions</b></em>' containment reference list.
@@ -71,6 +70,6 @@ public interface RoutesRepository extends EObject {
* @model containment="true"
* @generated
*/
- EList<Direction> getDirections();
+ List<Direction> getDirections();
} // RoutesRepository
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SDN.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SDN.java
index 3c0cf8e4..c6c4276c 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SDN.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SDN.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -65,7 +65,7 @@ public interface SDN extends IType {
* @model opposite="nodes" required="true"
* @generated
*/
- EList<SdnController> getController();
+ List<SdnController> getController();
/**
* Returns the value of the '<em><b>Open Flow End Point</b></em>' reference.
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnController.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnController.java
index a4006d3d..d684ab1b 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnController.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnController.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -38,7 +38,7 @@ public interface SdnController extends CommunicatingApplication {
* @model opposite="belongsTo" containment="true"
* @generated
*/
- EList<SdnControllerApplication> getApplications();
+ List<SdnControllerApplication> getApplications();
/**
* Returns the value of the '<em><b>Nodes</b></em>' reference list.
@@ -56,6 +56,6 @@ public interface SdnController extends CommunicatingApplication {
* @model opposite="controller"
* @generated
*/
- EList<SDN> getNodes();
+ List<SDN> getNodes();
} // SdnController
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnNodePerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnNodePerformanceType.java
index 12de886c..e2d4dfbe 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnNodePerformanceType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnNodePerformanceType.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface SdnNodePerformanceType extends ITypedEntity {
* @model opposite="entityType"
* @generated
*/
- EList<PerformanceSdnNode> getEntities();
+ List<PerformanceSdnNode> getEntities();
} // SdnNodePerformanceType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SequenceAction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SequenceAction.java
index 104f2ea9..3280b46d 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SequenceAction.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SequenceAction.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -35,6 +35,6 @@ public interface SequenceAction extends AbstractAction {
* @model containment="true" required="true"
* @generated
*/
- EList<AbstractAction> getIntern();
+ List<AbstractAction> getIntern();
} // SequenceAction
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TrafficSource.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TrafficSource.java
index 0df90258..37d8c60f 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TrafficSource.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TrafficSource.java
@@ -2,7 +2,7 @@
*/
package tools.descartes.dni.dnimm3;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -36,7 +36,7 @@ public interface TrafficSource extends Entity, AddressableEntity {
* @model containment="true" required="true"
* @generated
*/
- EList<Workload> getWorkload();
+ List<Workload> getWorkload();
/**
* Returns the value of the '<em><b>Software Component</b></em>' container reference.
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/BranchActionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/BranchActionImpl.java
index aae99e94..b7404fa9 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/BranchActionImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/BranchActionImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -68,7 +69,7 @@ public class BranchActionImpl extends MinimalEObjectImpl.Container implements Br
* <!-- end-user-doc -->
* @generated
*/
- public EList<AbstractAction> getIntern() {
+ public List<AbstractAction> getIntern() {
if (intern == null) {
intern = new EObjectContainmentEList<AbstractAction>(AbstractAction.class, this, DNIPackage.BRANCH_ACTION__INTERN);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/CommunicatingApplicationImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/CommunicatingApplicationImpl.java
index 09e31a90..bb68038f 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/CommunicatingApplicationImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/CommunicatingApplicationImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -166,7 +167,7 @@ public class CommunicatingApplicationImpl extends IdentifierImpl implements Comm
* <!-- end-user-doc -->
* @generated
*/
- public EList<TrafficSource> getTrafficSources() {
+ public List<TrafficSource> getTrafficSources() {
if (trafficSources == null) {
trafficSources = new EObjectContainmentWithInverseEList<TrafficSource>(TrafficSource.class, this, DNIPackage.COMMUNICATING_APPLICATION__TRAFFIC_SOURCES, DNIPackage.TRAFFIC_SOURCE__SOFTWARE_COMPONENT);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DiscreteFunctionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DiscreteFunctionImpl.java
index c029f98e..a9a4422d 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DiscreteFunctionImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DiscreteFunctionImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -125,7 +126,7 @@ public class DiscreteFunctionImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
- public EList<FloatCoordinate> getVals() {
+ public List<FloatCoordinate> getVals() {
if (vals == null) {
vals = new EObjectContainmentEList<FloatCoordinate>(FloatCoordinate.class, this, DNIPackage.DISCRETE_FUNCTION__VALS);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndImpl.java
index 11b8bb6f..7fc2bfde 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -138,7 +139,7 @@ public class EndImpl extends IdentifierImpl implements End {
* <!-- end-user-doc -->
* @generated
*/
- public EList<CommunicatingApplication> getSoftware() {
+ public List<CommunicatingApplication> getSoftware() {
if (software == null) {
software = new EObjectWithInverseResolvingEList<CommunicatingApplication>(CommunicatingApplication.class, this, DNIPackage.END__SOFTWARE, DNIPackage.COMMUNICATING_APPLICATION__DEPLOYED_ON);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndPerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndPerformanceTypeImpl.java
index 388baf6f..abb72eb3 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndPerformanceTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndPerformanceTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -255,7 +256,7 @@ public class EndPerformanceTypeImpl extends MinimalEObjectImpl.Container impleme
* <!-- end-user-doc -->
* @generated
*/
- public EList<EndPerformance> getEntities() {
+ public List<EndPerformance> getEntities() {
if (entities == null) {
entities = new EObjectWithInverseResolvingEList<EndPerformance>(EndPerformance.class, this, DNIPackage.END_PERFORMANCE_TYPE__ENTITIES, DNIPackage.END_PERFORMANCE__ENTITY_TYPE);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EntityTypesImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EntityTypesImpl.java
index 1e729929..3e40830b 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EntityTypesImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EntityTypesImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -68,7 +69,7 @@ public class EntityTypesImpl extends MinimalEObjectImpl.Container implements Ent
* <!-- end-user-doc -->
* @generated
*/
- public EList<ITypedEntity> getTypes() {
+ public List<ITypedEntity> getTypes() {
if (types == null) {
types = new EObjectContainmentEList<ITypedEntity>(ITypedEntity.class, this, DNIPackage.ENTITY_TYPES__TYPES);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowImpl.java
index 54170222..beca5e97 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -229,7 +230,7 @@ public class FlowImpl extends IdentifierImpl implements Flow {
* <!-- end-user-doc -->
* @generated
*/
- public EList<FlowTraffic> getGeneratedTraffic() {
+ public List<FlowTraffic> getGeneratedTraffic() {
if (generatedTraffic == null) {
generatedTraffic = new EObjectContainmentWithInverseEList<FlowTraffic>(FlowTraffic.class, this, DNIPackage.FLOW__GENERATED_TRAFFIC, DNIPackage.FLOW_TRAFFIC__FLOW);
}
@@ -241,7 +242,7 @@ public class FlowImpl extends IdentifierImpl implements Flow {
* <!-- end-user-doc -->
* @generated
*/
- public EList<CommunicatingApplication> getDestinationSoftware() {
+ public List<CommunicatingApplication> getDestinationSoftware() {
if (destinationSoftware == null) {
destinationSoftware = new EObjectResolvingEList<CommunicatingApplication>(CommunicatingApplication.class, this, DNIPackage.FLOW__DESTINATION_SOFTWARE);
}
@@ -253,7 +254,7 @@ public class FlowImpl extends IdentifierImpl implements Flow {
* <!-- end-user-doc -->
* @generated
*/
- public EList<EntityAddress> getDestinationAddresses() {
+ public List<EntityAddress> getDestinationAddresses() {
if (destinationAddresses == null) {
destinationAddresses = new EObjectContainmentEList<EntityAddress>(EntityAddress.class, this, DNIPackage.FLOW__DESTINATION_ADDRESSES);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/GenericWorkloadImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/GenericWorkloadImpl.java
index 74392db3..fca0ad6f 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/GenericWorkloadImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/GenericWorkloadImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -68,7 +69,7 @@ public class GenericWorkloadImpl extends MinimalEObjectImpl.Container implements
* <!-- end-user-doc -->
* @generated
*/
- public EList<AbstractAction> getActions() {
+ public List<AbstractAction> getActions() {
if (actions == null) {
actions = new EObjectContainmentEList<AbstractAction>(AbstractAction.class, this, DNIPackage.GENERIC_WORKLOAD__ACTIONS);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceTypeImpl.java
index 3da4144c..80b3623f 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -255,7 +256,7 @@ public class IntermediatePerformanceTypeImpl extends MinimalEObjectImpl.Containe
* <!-- end-user-doc -->
* @generated
*/
- public EList<IntermediatePerformance> getEntities() {
+ public List<IntermediatePerformance> getEntities() {
if (entities == null) {
entities = new EObjectWithInverseResolvingEList<IntermediatePerformance>(IntermediatePerformance.class, this, DNIPackage.INTERMEDIATE_PERFORMANCE_TYPE__ENTITIES, DNIPackage.INTERMEDIATE_PERFORMANCE__ENTITY_TYPE);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java
index 89963ab1..962c7614 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -188,7 +189,7 @@ public class LinkImpl extends IdentifierImpl implements Link {
* <!-- end-user-doc -->
* @generated
*/
- public EList<NetworkInterface> getConnects() {
+ public List<NetworkInterface> getConnects() {
if (connects == null) {
connects = new EObjectResolvingEList<NetworkInterface>(NetworkInterface.class, this, DNIPackage.LINK__CONNECTS);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkPerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkPerformanceTypeImpl.java
index eb9f8753..a7e6a6db 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkPerformanceTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkPerformanceTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -255,7 +256,7 @@ public class LinkPerformanceTypeImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
- public EList<PerformanceLink> getEntities() {
+ public List<PerformanceLink> getEntities() {
if (entities == null) {
entities = new EObjectWithInverseResolvingEList<PerformanceLink>(PerformanceLink.class, this, DNIPackage.LINK_PERFORMANCE_TYPE__ENTITIES, DNIPackage.PERFORMANCE_LINK__ENTITY_TYPE);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java
index 5ca4c2bf..da72264d 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -255,7 +256,7 @@ public class LinkTypeImpl extends MinimalEObjectImpl.Container implements LinkTy
* <!-- end-user-doc -->
* @generated
*/
- public EList<Link> getEntities() {
+ public List<Link> getEntities() {
if (entities == null) {
entities = new EObjectWithInverseResolvingEList<Link>(Link.class, this, DNIPackage.LINK_TYPE__ENTITIES, DNIPackage.LINK__ENTITY_TYPE);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkConfigurationImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkConfigurationImpl.java
index 78c2024d..b86cdec8 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkConfigurationImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkConfigurationImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -180,7 +181,7 @@ public class NetworkConfigurationImpl extends MinimalEObjectImpl.Container imple
* <!-- end-user-doc -->
* @generated
*/
- public EList<SdnFlowRule> getRules() {
+ public List<SdnFlowRule> getRules() {
if (rules == null) {
rules = new EObjectContainmentEList<SdnFlowRule>(SdnFlowRule.class, this, DNIPackage.NETWORK_CONFIGURATION__RULES);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceImpl.java
index 82d9eb72..ec159c5c 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -206,7 +207,7 @@ public class NetworkInterfaceImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
- public EList<EntityAddress> getAddresses() {
+ public List<EntityAddress> getAddresses() {
if (addresses == null) {
addresses = new EObjectContainmentEList<EntityAddress>(EntityAddress.class, this, DNIPackage.NETWORK_INTERFACE__ADDRESSES);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfacePerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfacePerformanceTypeImpl.java
index b7270732..abd0e40d 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfacePerformanceTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfacePerformanceTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -255,7 +256,7 @@ public class NetworkInterfacePerformanceTypeImpl extends MinimalEObjectImpl.Cont
* <!-- end-user-doc -->
* @generated
*/
- public EList<PerformanceNetworkInterface> getEntities() {
+ public List<PerformanceNetworkInterface> getEntities() {
if (entities == null) {
entities = new EObjectWithInverseResolvingEList<PerformanceNetworkInterface>(PerformanceNetworkInterface.class, this, DNIPackage.NETWORK_INTERFACE_PERFORMANCE_TYPE__ENTITIES, DNIPackage.PERFORMANCE_NETWORK_INTERFACE__ENTITY_TYPE);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceTypeImpl.java
index 32c2033d..adf8d3e3 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -255,7 +256,7 @@ public class NetworkInterfaceTypeImpl extends MinimalEObjectImpl.Container imple
* <!-- end-user-doc -->
* @generated
*/
- public EList<NetworkInterface> getEntities() {
+ public List<NetworkInterface> getEntities() {
if (entities == null) {
entities = new EObjectWithInverseResolvingEList<NetworkInterface>(NetworkInterface.class, this, DNIPackage.NETWORK_INTERFACE_TYPE__ENTITIES, DNIPackage.NETWORK_INTERFACE__ENTITY_TYPE);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkStructureImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkStructureImpl.java
index 4b1e97c2..14d302e7 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkStructureImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkStructureImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -80,7 +81,7 @@ public class NetworkStructureImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
- public EList<Node> getNodes() {
+ public List<Node> getNodes() {
if (nodes == null) {
nodes = new EObjectContainmentEList<Node>(Node.class, this, DNIPackage.NETWORK_STRUCTURE__NODES);
}
@@ -92,7 +93,7 @@ public class NetworkStructureImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
- public EList<Link> getLinks() {
+ public List<Link> getLinks() {
if (links == null) {
links = new EObjectContainmentEList<Link>(Link.class, this, DNIPackage.NETWORK_STRUCTURE__LINKS);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkTrafficImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkTrafficImpl.java
index e348b5cf..a250ec08 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkTrafficImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkTrafficImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -80,7 +81,7 @@ public class NetworkTrafficImpl extends MinimalEObjectImpl.Container implements
* <!-- end-user-doc -->
* @generated
*/
- public EList<Flow> getFlows() {
+ public List<Flow> getFlows() {
if (flows == null) {
flows = new EObjectContainmentEList<Flow>(Flow.class, this, DNIPackage.NETWORK_TRAFFIC__FLOWS);
}
@@ -92,7 +93,7 @@ public class NetworkTrafficImpl extends MinimalEObjectImpl.Container implements
* <!-- end-user-doc -->
* @generated
*/
- public EList<CommunicatingApplication> getSoftware() {
+ public List<CommunicatingApplication> getSoftware() {
if (software == null) {
software = new EObjectContainmentEList<CommunicatingApplication>(CommunicatingApplication.class, this, DNIPackage.NETWORK_TRAFFIC__SOFTWARE);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeImpl.java
index 02782668..64733ff2 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -266,7 +267,7 @@ public class NodeImpl extends IdentifierImpl implements Node {
* <!-- end-user-doc -->
* @generated
*/
- public EList<NetworkInterface> getInterfaces() {
+ public List<NetworkInterface> getInterfaces() {
if (interfaces == null) {
interfaces = new EObjectContainmentWithInverseEList<NetworkInterface>(NetworkInterface.class, this, DNIPackage.NODE__INTERFACES, DNIPackage.NETWORK_INTERFACE__NODE);
}
@@ -387,7 +388,7 @@ public class NodeImpl extends IdentifierImpl implements Node {
* <!-- end-user-doc -->
* @generated
*/
- public EList<Node> getHosts() {
+ public List<Node> getHosts() {
if (hosts == null) {
hosts = new EObjectWithInverseResolvingEList<Node>(Node.class, this, DNIPackage.NODE__HOSTS, DNIPackage.NODE__IS_HOSTED_ON);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java
index 0716427f..09743720 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -255,7 +256,7 @@ public class NodeTypeImpl extends MinimalEObjectImpl.Container implements NodeTy
* <!-- end-user-doc -->
* @generated
*/
- public EList<Node> getEntities() {
+ public List<Node> getEntities() {
if (entities == null) {
entities = new EObjectWithInverseResolvingEList<Node>(Node.class, this, DNIPackage.NODE_TYPE__ENTITIES, DNIPackage.NODE__ENTITY_TYPE);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolStackImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolStackImpl.java
index 029d3127..24216537 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolStackImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolStackImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -154,7 +155,7 @@ public class ProtocolStackImpl extends IdentifierImpl implements ProtocolStack {
* <!-- end-user-doc -->
* @generated
*/
- public EList<ProtocolLayer> getLayers() {
+ public List<ProtocolLayer> getLayers() {
if (layers == null) {
layers = new EObjectContainmentEList<ProtocolLayer>(ProtocolLayer.class, this, DNIPackage.PROTOCOL_STACK__LAYERS);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolsRepositoryImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolsRepositoryImpl.java
index b5b778dc..daa61026 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolsRepositoryImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolsRepositoryImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -80,7 +81,7 @@ public class ProtocolsRepositoryImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
- public EList<ProtocolStack> getStacks() {
+ public List<ProtocolStack> getStacks() {
if (stacks == null) {
stacks = new EObjectContainmentEList<ProtocolStack>(ProtocolStack.class, this, DNIPackage.PROTOCOLS_REPOSITORY__STACKS);
}
@@ -92,7 +93,7 @@ public class ProtocolsRepositoryImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
- public EList<NetworkProtocol> getProtocols() {
+ public List<NetworkProtocol> getProtocols() {
if (protocols == null) {
protocols = new EObjectContainmentEList<NetworkProtocol>(NetworkProtocol.class, this, DNIPackage.PROTOCOLS_REPOSITORY__PROTOCOLS);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RoutesRepositoryImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RoutesRepositoryImpl.java
index e9a6eac7..6b68a11c 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RoutesRepositoryImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RoutesRepositoryImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -92,7 +93,7 @@ public class RoutesRepositoryImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
- public EList<Route> getRoutes() {
+ public List<Route> getRoutes() {
if (routes == null) {
routes = new EObjectContainmentEList<Route>(Route.class, this, DNIPackage.ROUTES_REPOSITORY__ROUTES);
}
@@ -104,7 +105,7 @@ public class RoutesRepositoryImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
- public EList<FlowRoute> getFlowRoutes() {
+ public List<FlowRoute> getFlowRoutes() {
if (flowRoutes == null) {
flowRoutes = new EObjectContainmentEList<FlowRoute>(FlowRoute.class, this, DNIPackage.ROUTES_REPOSITORY__FLOW_ROUTES);
}
@@ -116,7 +117,7 @@ public class RoutesRepositoryImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
- public EList<Direction> getDirections() {
+ public List<Direction> getDirections() {
if (directions == null) {
directions = new EObjectContainmentEList<Direction>(Direction.class, this, DNIPackage.ROUTES_REPOSITORY__DIRECTIONS);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SDNImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SDNImpl.java
index 17c2daee..0a974040 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SDNImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SDNImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -137,7 +138,7 @@ public class SDNImpl extends MinimalEObjectImpl.Container implements SDN {
* <!-- end-user-doc -->
* @generated
*/
- public EList<SdnController> getController() {
+ public List<SdnController> getController() {
if (controller == null) {
controller = new EObjectWithInverseResolvingEList.ManyInverse<SdnController>(SdnController.class, this, DNIPackage.SDN__CONTROLLER, DNIPackage.SDN_CONTROLLER__NODES);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControllerImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControllerImpl.java
index 7bc17d6c..a4fcf4c0 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControllerImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControllerImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -79,7 +80,7 @@ public class SdnControllerImpl extends CommunicatingApplicationImpl implements S
* <!-- end-user-doc -->
* @generated
*/
- public EList<SdnControllerApplication> getApplications() {
+ public List<SdnControllerApplication> getApplications() {
if (applications == null) {
applications = new EObjectContainmentWithInverseEList<SdnControllerApplication>(SdnControllerApplication.class, this, DNIPackage.SDN_CONTROLLER__APPLICATIONS, DNIPackage.SDN_CONTROLLER_APPLICATION__BELONGS_TO);
}
@@ -91,7 +92,7 @@ public class SdnControllerImpl extends CommunicatingApplicationImpl implements S
* <!-- end-user-doc -->
* @generated
*/
- public EList<SDN> getNodes() {
+ public List<SDN> getNodes() {
if (nodes == null) {
nodes = new EObjectWithInverseResolvingEList.ManyInverse<SDN>(SDN.class, this, DNIPackage.SDN_CONTROLLER__NODES, DNIPackage.SDN__CONTROLLER);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java
index e72966a2..0d7df565 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -255,7 +256,7 @@ public class SdnNodePerformanceTypeImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
- public EList<PerformanceSdnNode> getEntities() {
+ public List<PerformanceSdnNode> getEntities() {
if (entities == null) {
entities = new EObjectWithInverseResolvingEList<PerformanceSdnNode>(PerformanceSdnNode.class, this, DNIPackage.SDN_NODE_PERFORMANCE_TYPE__ENTITIES, DNIPackage.PERFORMANCE_SDN_NODE__ENTITY_TYPE);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SequenceActionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SequenceActionImpl.java
index 143f4606..05d12dbe 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SequenceActionImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SequenceActionImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -68,7 +69,7 @@ public class SequenceActionImpl extends MinimalEObjectImpl.Container implements
* <!-- end-user-doc -->
* @generated
*/
- public EList<AbstractAction> getIntern() {
+ public List<AbstractAction> getIntern() {
if (intern == null) {
intern = new EObjectContainmentEList<AbstractAction>(AbstractAction.class, this, DNIPackage.SEQUENCE_ACTION__INTERN);
}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TrafficSourceImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TrafficSourceImpl.java
index b5eeb6d2..b3941d22 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TrafficSourceImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TrafficSourceImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -170,7 +171,7 @@ public class TrafficSourceImpl extends IdentifierImpl implements TrafficSource {
* <!-- end-user-doc -->
* @generated
*/
- public EList<EntityAddress> getAddresses() {
+ public List<EntityAddress> getAddresses() {
if (addresses == null) {
addresses = new EObjectContainmentEList<EntityAddress>(EntityAddress.class, this, DNIPackage.TRAFFIC_SOURCE__ADDRESSES);
}
@@ -182,7 +183,7 @@ public class TrafficSourceImpl extends IdentifierImpl implements TrafficSource {
* <!-- end-user-doc -->
* @generated
*/
- public EList<Workload> getWorkload() {
+ public List<Workload> getWorkload() {
if (workload == null) {
workload = new EObjectContainmentEList<Workload>(Workload.class, this, DNIPackage.TRAFFIC_SOURCE__WORKLOAD);
}
--
GitLab