Skip to content
Snippets Groups Projects
Commit b73d072a authored by Fabian Brosig's avatar Fabian Brosig
Browse files

removed CoarseGrainedBehavior#describedEntity 

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/DMM/trunk@16515 9e42b895-fcda-4063-8a3b-11be15eb1bbd
parent 68edc6dc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 147 deletions
edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore
+ 0
− 2
View file @ b73d072a
......@@ -128,8 +128,6 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
<details key="AtMostOneCoarseGrainedBehaviorPerProvidedService" value="&#xA;&#x9;&#x9;&#x9;self.describedEntity.coarseGrainedBehavior->forAll(cgb1 : CoarseGrainedBehavior | cgb1.describedSignature = self.describedSignature implies cgb1 = self)"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="describedEntity" lowerBound="1"
eType="ecore:EClass repository.ecore#//InterfaceProvidingRequiringEntity"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="externalCallFrequency"
ordered="false" upperBound="-1" eType="#//ExternalCallFrequency" containment="true"
eOpposite="#//ExternalCallFrequency/coarseGrainedBehavior"/>
......
edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore.oclinecore
+ 0
− 1
View file @ b73d072a
......@@ -122,7 +122,6 @@ package servicebehavior : servicebehavior = 'http://www.descartes-research.net/m
{
invariant AtMostOneCoarseGrainedBehaviorPerProvidedService:
self.describedEntity.coarseGrainedBehavior->forAll(cgb1 : CoarseGrainedBehavior | cgb1.describedSignature = self.describedSignature implies cgb1 = self);
property describedEntity : repository::InterfaceProvidingRequiringEntity;
property externalCallFrequency#coarseGrainedBehavior : ExternalCallFrequency[*] { composes };
property resourceDemand#coarseGrainedBehavior : ResourceDemand[*] { composes };
}
......
edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/CoarseGrainedBehavior.java
+ 0
− 29
View file @ b73d072a
......@@ -3,8 +3,6 @@
*/
package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceProvidingRequiringEntity;
import org.eclipse.emf.common.util.EList;
/**
......@@ -43,7 +41,6 @@ import org.eclipse.emf.common.util.EList;
* <p>
* The following features are supported:
* <ul>
* <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CoarseGrainedBehavior#getDescribedEntity <em>Described Entity</em>}</li>
* <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CoarseGrainedBehavior#getExternalCallFrequency <em>External Call Frequency</em>}</li>
* <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CoarseGrainedBehavior#getResourceDemand <em>Resource Demand</em>}</li>
* </ul>
......@@ -55,32 +52,6 @@ import org.eclipse.emf.common.util.EList;
* @generated
*/
public interface CoarseGrainedBehavior extends ServiceBehaviorAbstraction {
/**
* Returns the value of the '<em><b>Described Entity</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Described Entity</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Described Entity</em>' reference.
* @see #setDescribedEntity(InterfaceProvidingRequiringEntity)
* @see edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage#getCoarseGrainedBehavior_DescribedEntity()
* @model required="true"
* @generated
*/
InterfaceProvidingRequiringEntity getDescribedEntity();
/**
* Sets the value of the '{@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CoarseGrainedBehavior#getDescribedEntity <em>Described Entity</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Described Entity</em>' reference.
* @see #getDescribedEntity()
* @generated
*/
void setDescribedEntity(InterfaceProvidingRequiringEntity value);
/**
* Returns the value of the '<em><b>External Call Frequency</b></em>' containment reference list.
* The list contents are of type {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCallFrequency}.
......
edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/ServicebehaviorPackage.java
+ 3
− 31
View file @ b73d072a
......@@ -806,15 +806,6 @@ public interface ServicebehaviorPackage extends EPackage {
*/
int COARSE_GRAINED_BEHAVIOR__INTERFACE_PROVIDING_ROLE = SERVICE_BEHAVIOR_ABSTRACTION__INTERFACE_PROVIDING_ROLE;
/**
* The feature id for the '<em><b>Described Entity</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int COARSE_GRAINED_BEHAVIOR__DESCRIBED_ENTITY = SERVICE_BEHAVIOR_ABSTRACTION_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>External Call Frequency</b></em>' containment reference list.
* <!-- begin-user-doc -->
......@@ -822,7 +813,7 @@ public interface ServicebehaviorPackage extends EPackage {
* @generated
* @ordered
*/
int COARSE_GRAINED_BEHAVIOR__EXTERNAL_CALL_FREQUENCY = SERVICE_BEHAVIOR_ABSTRACTION_FEATURE_COUNT + 1;
int COARSE_GRAINED_BEHAVIOR__EXTERNAL_CALL_FREQUENCY = SERVICE_BEHAVIOR_ABSTRACTION_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Resource Demand</b></em>' containment reference list.
......@@ -831,7 +822,7 @@ public interface ServicebehaviorPackage extends EPackage {
* @generated
* @ordered
*/
int COARSE_GRAINED_BEHAVIOR__RESOURCE_DEMAND = SERVICE_BEHAVIOR_ABSTRACTION_FEATURE_COUNT + 2;
int COARSE_GRAINED_BEHAVIOR__RESOURCE_DEMAND = SERVICE_BEHAVIOR_ABSTRACTION_FEATURE_COUNT + 1;
/**
* The number of structural features of the '<em>Coarse Grained Behavior</em>' class.
......@@ -840,7 +831,7 @@ public interface ServicebehaviorPackage extends EPackage {
* @generated
* @ordered
*/
int COARSE_GRAINED_BEHAVIOR_FEATURE_COUNT = SERVICE_BEHAVIOR_ABSTRACTION_FEATURE_COUNT + 3;
int COARSE_GRAINED_BEHAVIOR_FEATURE_COUNT = SERVICE_BEHAVIOR_ABSTRACTION_FEATURE_COUNT + 2;
/**
* The meta object id for the '{@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.impl.ExternalCallFrequencyImpl <em>External Call Frequency</em>}' class.
......@@ -1509,17 +1500,6 @@ public interface ServicebehaviorPackage extends EPackage {
*/
EClass getCoarseGrainedBehavior();
/**
* Returns the meta object for the reference '{@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CoarseGrainedBehavior#getDescribedEntity <em>Described Entity</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Described Entity</em>'.
* @see edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CoarseGrainedBehavior#getDescribedEntity()
* @see #getCoarseGrainedBehavior()
* @generated
*/
EReference getCoarseGrainedBehavior_DescribedEntity();
/**
* Returns the meta object for the containment reference list '{@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CoarseGrainedBehavior#getExternalCallFrequency <em>External Call Frequency</em>}'.
* <!-- begin-user-doc -->
......@@ -2060,14 +2040,6 @@ public interface ServicebehaviorPackage extends EPackage {
*/
EClass COARSE_GRAINED_BEHAVIOR = eINSTANCE.getCoarseGrainedBehavior();
/**
* The meta object literal for the '<em><b>Described Entity</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
EReference COARSE_GRAINED_BEHAVIOR__DESCRIBED_ENTITY = eINSTANCE.getCoarseGrainedBehavior_DescribedEntity();
/**
* The meta object literal for the '<em><b>External Call Frequency</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
......
edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/impl/CoarseGrainedBehaviorImpl.java
+ 2
− 70
View file @ b73d072a
......@@ -3,25 +3,15 @@
*/
package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.impl;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceProvidingRequiringEntity;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CoarseGrainedBehavior;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCallFrequency;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ResourceDemand;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
import org.eclipse.emf.ecore.util.InternalEList;
......@@ -32,7 +22,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <p>
* The following features are implemented:
* <ul>
* <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.impl.CoarseGrainedBehaviorImpl#getDescribedEntity <em>Described Entity</em>}</li>
* <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.impl.CoarseGrainedBehaviorImpl#getExternalCallFrequency <em>External Call Frequency</em>}</li>
* <li>{@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.impl.CoarseGrainedBehaviorImpl#getResourceDemand <em>Resource Demand</em>}</li>
* </ul>
......@@ -41,16 +30,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* @generated
*/
public class CoarseGrainedBehaviorImpl extends ServiceBehaviorAbstractionImpl implements CoarseGrainedBehavior {
/**
* The cached value of the '{@link #getDescribedEntity() <em>Described Entity</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getDescribedEntity()
* @generated
* @ordered
*/
protected InterfaceProvidingRequiringEntity describedEntity;
/**
* The cached value of the '{@link #getExternalCallFrequency() <em>External Call Frequency</em>}' containment reference list.
* <!-- begin-user-doc -->
......@@ -95,44 +74,7 @@ public class CoarseGrainedBehaviorImpl extends ServiceBehaviorAbstractionImpl im
* <!-- end-user-doc -->
* @generated
*/
public InterfaceProvidingRequiringEntity getDescribedEntity() {
if (describedEntity != null && describedEntity.eIsProxy()) {
InternalEObject oldDescribedEntity = (InternalEObject)describedEntity;
describedEntity = (InterfaceProvidingRequiringEntity)eResolveProxy(oldDescribedEntity);
if (describedEntity != oldDescribedEntity) {
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.RESOLVE, ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__DESCRIBED_ENTITY, oldDescribedEntity, describedEntity));
}
}
return describedEntity;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public InterfaceProvidingRequiringEntity basicGetDescribedEntity() {
return describedEntity;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public void setDescribedEntity(InterfaceProvidingRequiringEntity newDescribedEntity) {
InterfaceProvidingRequiringEntity oldDescribedEntity = describedEntity;
describedEntity = newDescribedEntity;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__DESCRIBED_ENTITY, oldDescribedEntity, describedEntity));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public EList<ExternalCallFrequency> getExternalCallFrequency() {
if (externalCallFrequency == null) {
externalCallFrequency = new EObjectContainmentWithInverseEList<ExternalCallFrequency>(ExternalCallFrequency.class, this, ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__EXTERNAL_CALL_FREQUENCY, ServicebehaviorPackage.EXTERNAL_CALL_FREQUENCY__COARSE_GRAINED_BEHAVIOR);
......@@ -145,6 +87,7 @@ public class CoarseGrainedBehaviorImpl extends ServiceBehaviorAbstractionImpl im
* <!-- end-user-doc -->
* @generated
*/
@Override
public EList<ResourceDemand> getResourceDemand() {
if (resourceDemand == null) {
resourceDemand = new EObjectContainmentWithInverseEList<ResourceDemand>(ResourceDemand.class, this, ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__RESOURCE_DEMAND, ServicebehaviorPackage.RESOURCE_DEMAND__COARSE_GRAINED_BEHAVIOR);
......@@ -193,9 +136,6 @@ public class CoarseGrainedBehaviorImpl extends ServiceBehaviorAbstractionImpl im
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__DESCRIBED_ENTITY:
if (resolve) return getDescribedEntity();
return basicGetDescribedEntity();
case ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__EXTERNAL_CALL_FREQUENCY:
return getExternalCallFrequency();
case ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__RESOURCE_DEMAND:
......@@ -213,9 +153,6 @@ public class CoarseGrainedBehaviorImpl extends ServiceBehaviorAbstractionImpl im
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
case ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__DESCRIBED_ENTITY:
setDescribedEntity((InterfaceProvidingRequiringEntity)newValue);
return;
case ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__EXTERNAL_CALL_FREQUENCY:
getExternalCallFrequency().clear();
getExternalCallFrequency().addAll((Collection<? extends ExternalCallFrequency>)newValue);
......@@ -236,9 +173,6 @@ public class CoarseGrainedBehaviorImpl extends ServiceBehaviorAbstractionImpl im
@Override
public void eUnset(int featureID) {
switch (featureID) {
case ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__DESCRIBED_ENTITY:
setDescribedEntity((InterfaceProvidingRequiringEntity)null);
return;
case ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__EXTERNAL_CALL_FREQUENCY:
getExternalCallFrequency().clear();
return;
......@@ -257,8 +191,6 @@ public class CoarseGrainedBehaviorImpl extends ServiceBehaviorAbstractionImpl im
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
case ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__DESCRIBED_ENTITY:
return describedEntity != null;
case ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__EXTERNAL_CALL_FREQUENCY:
return externalCallFrequency != null && !externalCallFrequency.isEmpty();
case ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__RESOURCE_DEMAND:
......
edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/impl/ServicebehaviorPackageImpl.java
+ 2
− 14
View file @ b73d072a
......@@ -710,16 +710,6 @@ public class ServicebehaviorPackageImpl extends EPackageImpl implements Serviceb
return coarseGrainedBehaviorEClass;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public EReference getCoarseGrainedBehavior_DescribedEntity() {
return (EReference)coarseGrainedBehaviorEClass.getEStructuralFeatures().get(0);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......@@ -727,7 +717,7 @@ public class ServicebehaviorPackageImpl extends EPackageImpl implements Serviceb
*/
@Override
public EReference getCoarseGrainedBehavior_ExternalCallFrequency() {
return (EReference)coarseGrainedBehaviorEClass.getEStructuralFeatures().get(1);
return (EReference)coarseGrainedBehaviorEClass.getEStructuralFeatures().get(0);
}
/**
......@@ -737,7 +727,7 @@ public class ServicebehaviorPackageImpl extends EPackageImpl implements Serviceb
*/
@Override
public EReference getCoarseGrainedBehavior_ResourceDemand() {
return (EReference)coarseGrainedBehaviorEClass.getEStructuralFeatures().get(2);
return (EReference)coarseGrainedBehaviorEClass.getEStructuralFeatures().get(1);
}
/**
......@@ -946,7 +936,6 @@ public class ServicebehaviorPackageImpl extends EPackageImpl implements Serviceb
createEReference(resourceDemandEClass, RESOURCE_DEMAND__EXPLICIT_DESCRIPTION);
coarseGrainedBehaviorEClass = createEClass(COARSE_GRAINED_BEHAVIOR);
createEReference(coarseGrainedBehaviorEClass, COARSE_GRAINED_BEHAVIOR__DESCRIBED_ENTITY);
createEReference(coarseGrainedBehaviorEClass, COARSE_GRAINED_BEHAVIOR__EXTERNAL_CALL_FREQUENCY);
createEReference(coarseGrainedBehaviorEClass, COARSE_GRAINED_BEHAVIOR__RESOURCE_DEMAND);
......@@ -1077,7 +1066,6 @@ public class ServicebehaviorPackageImpl extends EPackageImpl implements Serviceb
initEReference(getResourceDemand_ExplicitDescription(), theFunctionsPackage.getRandomVariable(), null, "explicitDescription", null, 0, 1, ResourceDemand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(coarseGrainedBehaviorEClass, CoarseGrainedBehavior.class, "CoarseGrainedBehavior", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getCoarseGrainedBehavior_DescribedEntity(), theRepositoryPackage.getInterfaceProvidingRequiringEntity(), null, "describedEntity", null, 1, 1, CoarseGrainedBehavior.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getCoarseGrainedBehavior_ExternalCallFrequency(), this.getExternalCallFrequency(), this.getExternalCallFrequency_CoarseGrainedBehavior(), "externalCallFrequency", null, 0, -1, CoarseGrainedBehavior.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEReference(getCoarseGrainedBehavior_ResourceDemand(), this.getResourceDemand(), this.getResourceDemand_CoarseGrainedBehavior(), "resourceDemand", null, 0, -1, CoarseGrainedBehavior.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment