Skip to content
Snippets Groups Projects
Commit 6320a48d authored by Sören Henning's avatar Sören Henning
Browse files

Merge branch 'Trace-Aggr-Analysis' into 'Trace-Aggr-Analysis-model-usage'

Trace aggr analysis



See merge request !24
parents 5330dd17 a1cffe37
No related tags found
1 merge request!24Trace aggr analysis
......@@ -62,12 +62,12 @@
<eClassifiers xsi:type="ecore:EClass" name="ExecutionRoot">
<eStructuralFeatures xsi:type="ecore:EReference" name="aggregatedInvocations"
upperBound="-1" eType="#//softwaresystem/execution/AggregatedInvocation"
eOpposite="#//softwaresystem/execution/AggregatedInvocation/executionContext"/>
eOpposite="#//softwaresystem/execution/AggregatedInvocation/executionRoot"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AggregatedInvocation">
<eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//softwaresystem/deployment/DeployedOperation"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//softwaresystem/deployment/DeployedOperation"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="executionContext" eType="#//softwaresystem/execution/ExecutionRoot"
<eStructuralFeatures xsi:type="ecore:EReference" name="executionRoot" eType="#//softwaresystem/execution/ExecutionRoot"
eOpposite="#//softwaresystem/execution/ExecutionRoot/aggregatedInvocations"/>
</eClassifiers>
</eSubpackages>
......
......@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EObject;
* <ul>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getSource <em>Source</em>}</li>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getTarget <em>Target</em>}</li>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getExecutionContext <em>Execution Context</em>}</li>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getExecutionRoot <em>Execution Root</em>}</li>
* </ul>
*
* @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage#getAggregatedInvocation()
......@@ -78,31 +78,31 @@ public interface AggregatedInvocation extends EObject {
void setTarget(DeployedOperation value);
/**
* Returns the value of the '<em><b>Execution Context</b></em>' reference.
* Returns the value of the '<em><b>Execution Root</b></em>' reference.
* It is bidirectional and its opposite is '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionRoot#getAggregatedInvocations <em>Aggregated Invocations</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Execution Context</em>' reference isn't clear,
* If the meaning of the '<em>Execution Root</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Execution Context</em>' reference.
* @see #setExecutionContext(ExecutionRoot)
* @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage#getAggregatedInvocation_ExecutionContext()
* @return the value of the '<em>Execution Root</em>' reference.
* @see #setExecutionRoot(ExecutionRoot)
* @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage#getAggregatedInvocation_ExecutionRoot()
* @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionRoot#getAggregatedInvocations
* @model opposite="aggregatedInvocations"
* @generated
*/
ExecutionRoot getExecutionContext();
ExecutionRoot getExecutionRoot();
/**
* Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getExecutionContext <em>Execution Context</em>}' reference.
* Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getExecutionRoot <em>Execution Root</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Execution Context</em>' reference.
* @see #getExecutionContext()
* @param value the new value of the '<em>Execution Root</em>' reference.
* @see #getExecutionRoot()
* @generated
*/
void setExecutionContext(ExecutionRoot value);
void setExecutionRoot(ExecutionRoot value);
} // AggregatedInvocation
......@@ -121,13 +121,13 @@ public interface ExecutionPackage extends EPackage {
int AGGREGATED_INVOCATION__TARGET = 1;
/**
* The feature id for the '<em><b>Execution Context</b></em>' reference.
* The feature id for the '<em><b>Execution Root</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int AGGREGATED_INVOCATION__EXECUTION_CONTEXT = 2;
int AGGREGATED_INVOCATION__EXECUTION_ROOT = 2;
/**
* The number of structural features of the '<em>Aggregated Invocation</em>' class.
......@@ -202,15 +202,15 @@ public interface ExecutionPackage extends EPackage {
EReference getAggregatedInvocation_Target();
/**
* Returns the meta object for the reference '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getExecutionContext <em>Execution Context</em>}'.
* Returns the meta object for the reference '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getExecutionRoot <em>Execution Root</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Execution Context</em>'.
* @see kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getExecutionContext()
* @return the meta object for the reference '<em>Execution Root</em>'.
* @see kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getExecutionRoot()
* @see #getAggregatedInvocation()
* @generated
*/
EReference getAggregatedInvocation_ExecutionContext();
EReference getAggregatedInvocation_ExecutionRoot();
/**
* Returns the factory that creates the instances of the model.
......@@ -280,12 +280,12 @@ public interface ExecutionPackage extends EPackage {
EReference AGGREGATED_INVOCATION__TARGET = eINSTANCE.getAggregatedInvocation_Target();
/**
* The meta object literal for the '<em><b>Execution Context</b></em>' reference feature.
* The meta object literal for the '<em><b>Execution Root</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
EReference AGGREGATED_INVOCATION__EXECUTION_CONTEXT = eINSTANCE.getAggregatedInvocation_ExecutionContext();
EReference AGGREGATED_INVOCATION__EXECUTION_ROOT = eINSTANCE.getAggregatedInvocation_ExecutionRoot();
}
......
......@@ -26,7 +26,7 @@ public interface ExecutionRoot extends EObject {
/**
* Returns the value of the '<em><b>Aggregated Invocations</b></em>' reference list.
* The list contents are of type {@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation}.
* It is bidirectional and its opposite is '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getExecutionContext <em>Execution Context</em>}'.
* It is bidirectional and its opposite is '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getExecutionRoot <em>Execution Root</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Aggregated Invocations</em>' reference list isn't clear,
......@@ -35,8 +35,8 @@ public interface ExecutionRoot extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Aggregated Invocations</em>' reference list.
* @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage#getExecutionRoot_AggregatedInvocations()
* @see kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getExecutionContext
* @model opposite="executionContext"
* @see kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getExecutionRoot
* @model opposite="executionRoot"
* @generated
*/
EList<AggregatedInvocation> getAggregatedInvocations();
......
......@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <ul>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.execution.impl.AggregatedInvocationImpl#getSource <em>Source</em>}</li>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.execution.impl.AggregatedInvocationImpl#getTarget <em>Target</em>}</li>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.execution.impl.AggregatedInvocationImpl#getExecutionContext <em>Execution Context</em>}</li>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.execution.impl.AggregatedInvocationImpl#getExecutionRoot <em>Execution Root</em>}</li>
* </ul>
*
* @generated
......@@ -54,14 +54,14 @@ public class AggregatedInvocationImpl extends MinimalEObjectImpl.Container imple
protected DeployedOperation target;
/**
* The cached value of the '{@link #getExecutionContext() <em>Execution Context</em>}' reference.
* The cached value of the '{@link #getExecutionRoot() <em>Execution Root</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getExecutionContext()
* @see #getExecutionRoot()
* @generated
* @ordered
*/
protected ExecutionRoot executionContext;
protected ExecutionRoot executionRoot;
/**
* <!-- begin-user-doc -->
......@@ -163,16 +163,16 @@ public class AggregatedInvocationImpl extends MinimalEObjectImpl.Container imple
* <!-- end-user-doc -->
* @generated
*/
public ExecutionRoot getExecutionContext() {
if (executionContext != null && executionContext.eIsProxy()) {
InternalEObject oldExecutionContext = (InternalEObject)executionContext;
executionContext = (ExecutionRoot)eResolveProxy(oldExecutionContext);
if (executionContext != oldExecutionContext) {
public ExecutionRoot getExecutionRoot() {
if (executionRoot != null && executionRoot.eIsProxy()) {
InternalEObject oldExecutionRoot = (InternalEObject)executionRoot;
executionRoot = (ExecutionRoot)eResolveProxy(oldExecutionRoot);
if (executionRoot != oldExecutionRoot) {
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_CONTEXT, oldExecutionContext, executionContext));
eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_ROOT, oldExecutionRoot, executionRoot));
}
}
return executionContext;
return executionRoot;
}
/**
......@@ -180,8 +180,8 @@ public class AggregatedInvocationImpl extends MinimalEObjectImpl.Container imple
* <!-- end-user-doc -->
* @generated
*/
public ExecutionRoot basicGetExecutionContext() {
return executionContext;
public ExecutionRoot basicGetExecutionRoot() {
return executionRoot;
}
/**
......@@ -189,11 +189,11 @@ public class AggregatedInvocationImpl extends MinimalEObjectImpl.Container imple
* <!-- end-user-doc -->
* @generated
*/
public NotificationChain basicSetExecutionContext(ExecutionRoot newExecutionContext, NotificationChain msgs) {
ExecutionRoot oldExecutionContext = executionContext;
executionContext = newExecutionContext;
public NotificationChain basicSetExecutionRoot(ExecutionRoot newExecutionRoot, NotificationChain msgs) {
ExecutionRoot oldExecutionRoot = executionRoot;
executionRoot = newExecutionRoot;
if (eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_CONTEXT, oldExecutionContext, newExecutionContext);
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_ROOT, oldExecutionRoot, newExecutionRoot);
if (msgs == null) msgs = notification; else msgs.add(notification);
}
return msgs;
......@@ -204,18 +204,18 @@ public class AggregatedInvocationImpl extends MinimalEObjectImpl.Container imple
* <!-- end-user-doc -->
* @generated
*/
public void setExecutionContext(ExecutionRoot newExecutionContext) {
if (newExecutionContext != executionContext) {
public void setExecutionRoot(ExecutionRoot newExecutionRoot) {
if (newExecutionRoot != executionRoot) {
NotificationChain msgs = null;
if (executionContext != null)
msgs = ((InternalEObject)executionContext).eInverseRemove(this, ExecutionPackage.EXECUTION_ROOT__AGGREGATED_INVOCATIONS, ExecutionRoot.class, msgs);
if (newExecutionContext != null)
msgs = ((InternalEObject)newExecutionContext).eInverseAdd(this, ExecutionPackage.EXECUTION_ROOT__AGGREGATED_INVOCATIONS, ExecutionRoot.class, msgs);
msgs = basicSetExecutionContext(newExecutionContext, msgs);
if (executionRoot != null)
msgs = ((InternalEObject)executionRoot).eInverseRemove(this, ExecutionPackage.EXECUTION_ROOT__AGGREGATED_INVOCATIONS, ExecutionRoot.class, msgs);
if (newExecutionRoot != null)
msgs = ((InternalEObject)newExecutionRoot).eInverseAdd(this, ExecutionPackage.EXECUTION_ROOT__AGGREGATED_INVOCATIONS, ExecutionRoot.class, msgs);
msgs = basicSetExecutionRoot(newExecutionRoot, msgs);
if (msgs != null) msgs.dispatch();
}
else if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_CONTEXT, newExecutionContext, newExecutionContext));
eNotify(new ENotificationImpl(this, Notification.SET, ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_ROOT, newExecutionRoot, newExecutionRoot));
}
/**
......@@ -226,10 +226,10 @@ public class AggregatedInvocationImpl extends MinimalEObjectImpl.Container imple
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_CONTEXT:
if (executionContext != null)
msgs = ((InternalEObject)executionContext).eInverseRemove(this, ExecutionPackage.EXECUTION_ROOT__AGGREGATED_INVOCATIONS, ExecutionRoot.class, msgs);
return basicSetExecutionContext((ExecutionRoot)otherEnd, msgs);
case ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_ROOT:
if (executionRoot != null)
msgs = ((InternalEObject)executionRoot).eInverseRemove(this, ExecutionPackage.EXECUTION_ROOT__AGGREGATED_INVOCATIONS, ExecutionRoot.class, msgs);
return basicSetExecutionRoot((ExecutionRoot)otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
......@@ -242,8 +242,8 @@ public class AggregatedInvocationImpl extends MinimalEObjectImpl.Container imple
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_CONTEXT:
return basicSetExecutionContext(null, msgs);
case ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_ROOT:
return basicSetExecutionRoot(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
......@@ -262,9 +262,9 @@ public class AggregatedInvocationImpl extends MinimalEObjectImpl.Container imple
case ExecutionPackage.AGGREGATED_INVOCATION__TARGET:
if (resolve) return getTarget();
return basicGetTarget();
case ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_CONTEXT:
if (resolve) return getExecutionContext();
return basicGetExecutionContext();
case ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_ROOT:
if (resolve) return getExecutionRoot();
return basicGetExecutionRoot();
}
return super.eGet(featureID, resolve, coreType);
}
......@@ -283,8 +283,8 @@ public class AggregatedInvocationImpl extends MinimalEObjectImpl.Container imple
case ExecutionPackage.AGGREGATED_INVOCATION__TARGET:
setTarget((DeployedOperation)newValue);
return;
case ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_CONTEXT:
setExecutionContext((ExecutionRoot)newValue);
case ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_ROOT:
setExecutionRoot((ExecutionRoot)newValue);
return;
}
super.eSet(featureID, newValue);
......@@ -304,8 +304,8 @@ public class AggregatedInvocationImpl extends MinimalEObjectImpl.Container imple
case ExecutionPackage.AGGREGATED_INVOCATION__TARGET:
setTarget((DeployedOperation)null);
return;
case ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_CONTEXT:
setExecutionContext((ExecutionRoot)null);
case ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_ROOT:
setExecutionRoot((ExecutionRoot)null);
return;
}
super.eUnset(featureID);
......@@ -323,8 +323,8 @@ public class AggregatedInvocationImpl extends MinimalEObjectImpl.Container imple
return source != null;
case ExecutionPackage.AGGREGATED_INVOCATION__TARGET:
return target != null;
case ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_CONTEXT:
return executionContext != null;
case ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_ROOT:
return executionRoot != null;
}
return super.eIsSet(featureID);
}
......
......@@ -175,7 +175,7 @@ public class ExecutionPackageImpl extends EPackageImpl implements ExecutionPacka
* <!-- end-user-doc -->
* @generated
*/
public EReference getAggregatedInvocation_ExecutionContext() {
public EReference getAggregatedInvocation_ExecutionRoot() {
return (EReference)aggregatedInvocationEClass.getEStructuralFeatures().get(2);
}
......@@ -213,7 +213,7 @@ public class ExecutionPackageImpl extends EPackageImpl implements ExecutionPacka
aggregatedInvocationEClass = createEClass(AGGREGATED_INVOCATION);
createEReference(aggregatedInvocationEClass, AGGREGATED_INVOCATION__SOURCE);
createEReference(aggregatedInvocationEClass, AGGREGATED_INVOCATION__TARGET);
createEReference(aggregatedInvocationEClass, AGGREGATED_INVOCATION__EXECUTION_CONTEXT);
createEReference(aggregatedInvocationEClass, AGGREGATED_INVOCATION__EXECUTION_ROOT);
}
/**
......@@ -250,12 +250,12 @@ public class ExecutionPackageImpl extends EPackageImpl implements ExecutionPacka
// Initialize classes, features, and operations; add parameters
initEClass(executionRootEClass, ExecutionRoot.class, "ExecutionRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getExecutionRoot_AggregatedInvocations(), this.getAggregatedInvocation(), this.getAggregatedInvocation_ExecutionContext(), "aggregatedInvocations", null, 0, -1, ExecutionRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getExecutionRoot_AggregatedInvocations(), this.getAggregatedInvocation(), this.getAggregatedInvocation_ExecutionRoot(), "aggregatedInvocations", null, 0, -1, ExecutionRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(aggregatedInvocationEClass, AggregatedInvocation.class, "AggregatedInvocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getAggregatedInvocation_Source(), theDeploymentPackage.getDeployedOperation(), null, "source", null, 0, 1, AggregatedInvocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getAggregatedInvocation_Target(), theDeploymentPackage.getDeployedOperation(), null, "target", null, 0, 1, AggregatedInvocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getAggregatedInvocation_ExecutionContext(), this.getExecutionRoot(), this.getExecutionRoot_AggregatedInvocations(), "executionContext", null, 0, 1, AggregatedInvocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getAggregatedInvocation_ExecutionRoot(), this.getExecutionRoot(), this.getExecutionRoot_AggregatedInvocations(), "executionRoot", null, 0, 1, AggregatedInvocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
}
} //ExecutionPackageImpl
......@@ -68,7 +68,7 @@ public class ExecutionRootImpl extends MinimalEObjectImpl.Container implements E
*/
public EList<AggregatedInvocation> getAggregatedInvocations() {
if (aggregatedInvocations == null) {
aggregatedInvocations = new EObjectWithInverseResolvingEList<AggregatedInvocation>(AggregatedInvocation.class, this, ExecutionPackage.EXECUTION_ROOT__AGGREGATED_INVOCATIONS, ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_CONTEXT);
aggregatedInvocations = new EObjectWithInverseResolvingEList<AggregatedInvocation>(AggregatedInvocation.class, this, ExecutionPackage.EXECUTION_ROOT__AGGREGATED_INVOCATIONS, ExecutionPackage.AGGREGATED_INVOCATION__EXECUTION_ROOT);
}
return aggregatedInvocations;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment