From 932351b24241649772b25c38476df520a3cc2c63 Mon Sep 17 00:00:00 2001
From: Simon Eismann <eismannsimon@googlemail.com>
Date: Tue, 16 Feb 2016 10:51:46 +0100
Subject: [PATCH] ordered
---
.../provider/ServiceInputParameterItemProvider.java | 5 -----
.../model/repository.ecore | 6 +++---
.../model/servicebehavior.ecore | 8 ++++----
.../repository/InterfaceProvidingRequiringEntity.java | 2 +-
.../repository/impl/RepositoryPackageImpl.java | 2 +-
.../servicebehavior/ServiceBehaviorAbstraction.java | 4 ++--
.../servicebehavior/impl/ServicebehaviorPackageImpl.java | 4 ++--
7 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ServiceInputParameterItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ServiceInputParameterItemProvider.java
index 8f16b58b..64d35b9d 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ServiceInputParameterItemProvider.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ServiceInputParameterItemProvider.java
@@ -7,18 +7,13 @@ package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider
import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesPackage;
import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ServiceInputParameter;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.InputParamter;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.Interface;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceProvidingRole;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServiceBehaviorAbstraction;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
import edu.kit.ipd.descartes.mm.applicationlevel.util.CustomItemPropertyDescriptor;
import edu.kit.ipd.descartes.mm.applicationlevel.util.NavigationCommand;
import edu.kit.ipd.descartes.mm.applicationlevel.util.NavigationUtil;
-
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore
index de94e81b..7cd8f99c 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore
@@ -45,9 +45,9 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="coarseGrainedBehavior"
upperBound="-1" eType="ecore:EClass servicebehavior.ecore#//CoarseGrainedBehavior"
containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="relationships" ordered="false"
- upperBound="-1" eType="ecore:EClass parameterdependency.ecore#//Relationship"
- containment="true" eOpposite="parameterdependency.ecore#//Relationship/surroundingEntity"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="relationships" upperBound="-1"
+ eType="ecore:EClass parameterdependency.ecore#//Relationship" containment="true"
+ eOpposite="parameterdependency.ecore#//Relationship/surroundingEntity"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Import">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="importURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore
index 56bd879d..dd3b9047 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore
@@ -25,11 +25,11 @@
<details key="InfluencingParameterNamesMustBeUnique" value="
			self.influencingParameter->select(inflp | inflp.oclIsKindOf(parameterdependencies::ShadowParameter))
									 ->collect(inflp | inflp.oclAsType(parameterdependencies::ShadowParameter))
									 ->isUnique(inflp | inflp.name)"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="describedSignature" eType="ecore:EClass repository.ecore#//Signature"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="influencingParameter" ordered="false"
- upperBound="-1" eType="ecore:EClass parameterdependency.ecore#//InfluencingParameter"
- containment="true" eOpposite="parameterdependency.ecore#//InfluencingParameter/behavior"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="influencingParameter" upperBound="-1"
+ eType="ecore:EClass parameterdependency.ecore#//InfluencingParameter" containment="true"
+ eOpposite="parameterdependency.ecore#//InfluencingParameter/behavior"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="influencedVariableReference"
- ordered="false" upperBound="-1" eType="ecore:EClass parameterdependency.ecore#//InfluencedVariableReference"
+ upperBound="-1" eType="ecore:EClass parameterdependency.ecore#//InfluencedVariableReference"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="interfaceProvidingRole"
eType="ecore:EClass repository.ecore#//InterfaceProvidingRole"/>
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingRequiringEntity.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingRequiringEntity.java
index f2546a9b..0c38a997 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingRequiringEntity.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingRequiringEntity.java
@@ -58,7 +58,7 @@ public interface InterfaceProvidingRequiringEntity extends InterfaceProvidingEnt
* @return the value of the '<em>Relationships</em>' containment reference list.
* @see edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage#getInterfaceProvidingRequiringEntity_Relationships()
* @see edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.Relationship#getSurroundingEntity
- * @model opposite="surroundingEntity" containment="true" ordered="false"
+ * @model opposite="surroundingEntity" containment="true"
* @generated
*/
EList<Relationship> getRelationships();
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/impl/RepositoryPackageImpl.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/impl/RepositoryPackageImpl.java
index 051ab714..48155f99 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/impl/RepositoryPackageImpl.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/impl/RepositoryPackageImpl.java
@@ -1466,7 +1466,7 @@ public class RepositoryPackageImpl extends EPackageImpl implements RepositoryPac
initEClass(interfaceProvidingRequiringEntityEClass, InterfaceProvidingRequiringEntity.class, "InterfaceProvidingRequiringEntity", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getInterfaceProvidingRequiringEntity_CoarseGrainedBehavior(), theServicebehaviorPackage.getCoarseGrainedBehavior(), null, "coarseGrainedBehavior", null, 0, -1, InterfaceProvidingRequiringEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getInterfaceProvidingRequiringEntity_Relationships(), theParameterdependenciesPackage.getRelationship(), theParameterdependenciesPackage.getRelationship_SurroundingEntity(), "relationships", null, 0, -1, InterfaceProvidingRequiringEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEReference(getInterfaceProvidingRequiringEntity_Relationships(), theParameterdependenciesPackage.getRelationship(), theParameterdependenciesPackage.getRelationship_SurroundingEntity(), "relationships", null, 0, -1, InterfaceProvidingRequiringEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getImport_ImportURI(), ecorePackage.getEString(), "importURI", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/ServiceBehaviorAbstraction.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/ServiceBehaviorAbstraction.java
index 7a6ad336..162b2082 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/ServiceBehaviorAbstraction.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/ServiceBehaviorAbstraction.java
@@ -74,7 +74,7 @@ public interface ServiceBehaviorAbstraction extends EObject {
* @return the value of the '<em>Influencing Parameter</em>' containment reference list.
* @see edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage#getServiceBehaviorAbstraction_InfluencingParameter()
* @see edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.InfluencingParameter#getBehavior
- * @model opposite="behavior" containment="true" ordered="false"
+ * @model opposite="behavior" containment="true"
* @generated
*/
EList<InfluencingParameter> getInfluencingParameter();
@@ -90,7 +90,7 @@ public interface ServiceBehaviorAbstraction extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Influenced Variable Reference</em>' containment reference list.
* @see edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage#getServiceBehaviorAbstraction_InfluencedVariableReference()
- * @model containment="true" ordered="false"
+ * @model containment="true"
* @generated
*/
EList<InfluencedVariableReference> getInfluencedVariableReference();
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/impl/ServicebehaviorPackageImpl.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/impl/ServicebehaviorPackageImpl.java
index 0dd653c4..200dfae0 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/impl/ServicebehaviorPackageImpl.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/impl/ServicebehaviorPackageImpl.java
@@ -1011,8 +1011,8 @@ public class ServicebehaviorPackageImpl extends EPackageImpl implements Serviceb
// Initialize classes and features; add operations and parameters
initEClass(serviceBehaviorAbstractionEClass, ServiceBehaviorAbstraction.class, "ServiceBehaviorAbstraction", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getServiceBehaviorAbstraction_DescribedSignature(), theRepositoryPackage.getSignature(), null, "describedSignature", null, 0, 1, ServiceBehaviorAbstraction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getServiceBehaviorAbstraction_InfluencingParameter(), theParameterdependenciesPackage.getInfluencingParameter(), theParameterdependenciesPackage.getInfluencingParameter_Behavior(), "influencingParameter", null, 0, -1, ServiceBehaviorAbstraction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
- initEReference(getServiceBehaviorAbstraction_InfluencedVariableReference(), theParameterdependenciesPackage.getInfluencedVariableReference(), null, "influencedVariableReference", null, 0, -1, ServiceBehaviorAbstraction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEReference(getServiceBehaviorAbstraction_InfluencingParameter(), theParameterdependenciesPackage.getInfluencingParameter(), theParameterdependenciesPackage.getInfluencingParameter_Behavior(), "influencingParameter", null, 0, -1, ServiceBehaviorAbstraction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getServiceBehaviorAbstraction_InfluencedVariableReference(), theParameterdependenciesPackage.getInfluencedVariableReference(), null, "influencedVariableReference", null, 0, -1, ServiceBehaviorAbstraction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getServiceBehaviorAbstraction_InterfaceProvidingRole(), theRepositoryPackage.getInterfaceProvidingRole(), null, "interfaceProvidingRole", null, 0, 1, ServiceBehaviorAbstraction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(fineGrainedBehaviorEClass, FineGrainedBehavior.class, "FineGrainedBehavior", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
--
GitLab