diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..51b9056ae8cca7676e258ee99947bccc789c974a
--- /dev/null
+++ b/META-INF/MANIFEST.MF
@@ -0,0 +1,43 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: kieker-teetime-stages;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: softwareSystem,
+ softwareSystem.architecture,
+ softwareSystem.architecture.impl,
+ softwareSystem.architecture.util,
+ softwareSystem.deployment,
+ softwareSystem.deployment.impl,
+ softwareSystem.deployment.util,
+ softwareSystem.execution,
+ softwareSystem.execution.impl,
+ softwareSystem.execution.util,
+ softwareSystem.impl,
+ softwareSystem.statistics,
+ softwareSystem.statistics.impl,
+ softwareSystem.statistics.util,
+ kieker.analysis.model.analysismodel,
+ kieker.analysis.model.analysismodel.impl,
+ kieker.analysis.model.analysismodel.softwaresystem.architecture,
+ kieker.analysis.model.analysismodel.softwaresystem.architecture.impl,
+ kieker.analysis.model.analysismodel.softwaresystem.architecture.util,
+ kieker.analysis.model.analysismodel.softwaresystem.deployment,
+ kieker.analysis.model.analysismodel.softwaresystem.deployment.impl,
+ kieker.analysis.model.analysismodel.softwaresystem.deployment.util,
+ kieker.analysis.model.analysismodel.softwaresystem.execution,
+ kieker.analysis.model.analysismodel.softwaresystem.execution.impl,
+ kieker.analysis.model.analysismodel.softwaresystem.execution.util,
+ kieker.analysis.model.analysismodel.statistics,
+ kieker.analysis.model.analysismodel.statistics.impl,
+ kieker.analysis.model.analysismodel.statistics.util,
+ kieker.analysis.model.analysismodel.softwaresystem.statistics,
+ kieker.analysis.model.analysismodel.softwaresystem.statistics.impl,
+ kieker.analysis.model.analysismodel.softwaresystem.statistics.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/build.properties b/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..4465407fcc2709f7088bd19ac4e379e426843081
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,10 @@
+#
+
+bin.includes = .,\
+ model/,\
+ META-INF/,\
+ plugin.xml,\
+ plugin.properties
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/plugin.properties b/plugin.properties
new file mode 100644
index 0000000000000000000000000000000000000000..f0b948013f6aaeebe3edb18f44282afdf22bff69
--- /dev/null
+++ b/plugin.properties
@@ -0,0 +1,4 @@
+#
+
+pluginName = Analysis-model Model
+providerName = www.example.org
diff --git a/plugin.xml b/plugin.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aae0219441ae24c465a6bb0a18f7047f4514b3f5
--- /dev/null
+++ b/plugin.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+-->
+
+<plugin>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated analysis-model -->
+ <package
+ uri="http://www.example.org/softwareSystem"
+ class="kieker.analysis.model.analysismodel.analysismodelPackage"
+ genModel="model/analysis-model.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated analysis-model -->
+ <package
+ uri="http://www.example.org/softwareSystem/architecture"
+ class="kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitecturePackage"
+ genModel="model/analysis-model.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated analysis-model -->
+ <package
+ uri="http://www.example.org/softwareSystem/deployment"
+ class="kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentPackage"
+ genModel="model/analysis-model.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated analysis-model -->
+ <package
+ uri="http://www.example.org/softwareSystem/execution"
+ class="kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage"
+ genModel="model/analysis-model.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated analysis-model -->
+ <package
+ uri="http://www.example.org/softwareSystem/statistics"
+ class="kieker.analysis.model.analysismodel.statistics.StatisticsPackage"
+ genModel="model/analysis-model.genmodel"/>
+ </extension>
+
+</plugin>
diff --git a/src/main/java/kieker/analysis/model/analysismodel/impl/analysismodelPackageImpl.java b/src/main/java/kieker/analysis/model/analysismodel/impl/analysismodelPackageImpl.java
index 2278cee678fdf382e6f6b9b9af6d7d686155a386..7c2c89fecd9f3e3b753b4dd2464a22c048937ca3 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/impl/analysismodelPackageImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/impl/analysismodelPackageImpl.java
@@ -19,9 +19,9 @@ import kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPac
import kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionPackageImpl;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage;
+import kieker.analysis.model.analysismodel.statistics.StatisticsPackage;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl;
+import kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EPackage;
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ArchitectureFactory.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ArchitectureFactory.java
index 673ec51ab181c1bc776829513dc3b76cb484306c..46afd690ac4ade91c5f71cafe6dba532b5cec646 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ArchitectureFactory.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ArchitectureFactory.java
@@ -21,6 +21,15 @@ public interface ArchitectureFactory extends EFactory {
*/
ArchitectureFactory eINSTANCE = kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ArchitectureFactoryImpl.init();
+ /**
+ * Returns a new object of class '<em>Root</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Root</em>'.
+ * @generated
+ */
+ ArchitectureRoot createArchitectureRoot();
+
/**
* Returns a new object of class '<em>Component Type</em>'.
* <!-- begin-user-doc -->
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ArchitecturePackage.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ArchitecturePackage.java
index c29406c6c43c26d9633b17f74e133ca12d0e69a9..555f95c4e2b73d593c3853e939a66ea8477bff53 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ArchitecturePackage.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ArchitecturePackage.java
@@ -56,6 +56,43 @@ public interface ArchitecturePackage extends EPackage {
*/
ArchitecturePackage eINSTANCE = kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ArchitecturePackageImpl.init();
+ /**
+ * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ArchitectureRootImpl <em>Root</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ArchitectureRootImpl
+ * @see kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ArchitecturePackageImpl#getArchitectureRoot()
+ * @generated
+ */
+ int ARCHITECTURE_ROOT = 0;
+
+ /**
+ * The feature id for the '<em><b>Component Types</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ARCHITECTURE_ROOT__COMPONENT_TYPES = 0;
+
+ /**
+ * The number of structural features of the '<em>Root</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ARCHITECTURE_ROOT_FEATURE_COUNT = 1;
+
+ /**
+ * The number of operations of the '<em>Root</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ARCHITECTURE_ROOT_OPERATION_COUNT = 0;
+
/**
* The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ComponentTypeImpl <em>Component Type</em>}' class.
* <!-- begin-user-doc -->
@@ -64,7 +101,7 @@ public interface ArchitecturePackage extends EPackage {
* @see kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ArchitecturePackageImpl#getComponentType()
* @generated
*/
- int COMPONENT_TYPE = 0;
+ int COMPONENT_TYPE = 1;
/**
* The feature id for the '<em><b>Package Name</b></em>' attribute.
@@ -85,13 +122,13 @@ public interface ArchitecturePackage extends EPackage {
int COMPONENT_TYPE__NAME = 1;
/**
- * The feature id for the '<em><b>Provided</b></em>' reference list.
+ * The feature id for the '<em><b>Provided Operations</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int COMPONENT_TYPE__PROVIDED = 2;
+ int COMPONENT_TYPE__PROVIDED_OPERATIONS = 2;
/**
* The number of structural features of the '<em>Component Type</em>' class.
@@ -119,7 +156,7 @@ public interface ArchitecturePackage extends EPackage {
* @see kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ArchitecturePackageImpl#getOperationType()
* @generated
*/
- int OPERATION_TYPE = 1;
+ int OPERATION_TYPE = 2;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -158,6 +195,27 @@ public interface ArchitecturePackage extends EPackage {
int OPERATION_TYPE_OPERATION_COUNT = 0;
+ /**
+ * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitectureRoot <em>Root</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Root</em>'.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitectureRoot
+ * @generated
+ */
+ EClass getArchitectureRoot();
+
+ /**
+ * Returns the meta object for the reference list '{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitectureRoot#getComponentTypes <em>Component Types</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Component Types</em>'.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitectureRoot#getComponentTypes()
+ * @see #getArchitectureRoot()
+ * @generated
+ */
+ EReference getArchitectureRoot_ComponentTypes();
+
/**
* Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.ComponentType <em>Component Type</em>}'.
* <!-- begin-user-doc -->
@@ -191,15 +249,15 @@ public interface ArchitecturePackage extends EPackage {
EAttribute getComponentType_Name();
/**
- * Returns the meta object for the reference list '{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.ComponentType#getProvided <em>Provided</em>}'.
+ * Returns the meta object for the reference list '{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.ComponentType#getProvidedOperations <em>Provided Operations</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Provided</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.architecture.ComponentType#getProvided()
+ * @return the meta object for the reference list '<em>Provided Operations</em>'.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.architecture.ComponentType#getProvidedOperations()
* @see #getComponentType()
* @generated
*/
- EReference getComponentType_Provided();
+ EReference getComponentType_ProvidedOperations();
/**
* Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.OperationType <em>Operation Type</em>}'.
@@ -256,6 +314,24 @@ public interface ArchitecturePackage extends EPackage {
* @generated
*/
interface Literals {
+ /**
+ * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ArchitectureRootImpl <em>Root</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ArchitectureRootImpl
+ * @see kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ArchitecturePackageImpl#getArchitectureRoot()
+ * @generated
+ */
+ EClass ARCHITECTURE_ROOT = eINSTANCE.getArchitectureRoot();
+
+ /**
+ * The meta object literal for the '<em><b>Component Types</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference ARCHITECTURE_ROOT__COMPONENT_TYPES = eINSTANCE.getArchitectureRoot_ComponentTypes();
+
/**
* The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ComponentTypeImpl <em>Component Type</em>}' class.
* <!-- begin-user-doc -->
@@ -283,12 +359,12 @@ public interface ArchitecturePackage extends EPackage {
EAttribute COMPONENT_TYPE__NAME = eINSTANCE.getComponentType_Name();
/**
- * The meta object literal for the '<em><b>Provided</b></em>' reference list feature.
+ * The meta object literal for the '<em><b>Provided Operations</b></em>' reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference COMPONENT_TYPE__PROVIDED = eINSTANCE.getComponentType_Provided();
+ EReference COMPONENT_TYPE__PROVIDED_OPERATIONS = eINSTANCE.getComponentType_ProvidedOperations();
/**
* The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.OperationTypeImpl <em>Operation Type</em>}' class.
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ArchitectureRoot.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ArchitectureRoot.java
new file mode 100644
index 0000000000000000000000000000000000000000..0910004202f7eee3cfcb6ab27c61646bc2233c43
--- /dev/null
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ArchitectureRoot.java
@@ -0,0 +1,42 @@
+/**
+ */
+package kieker.analysis.model.analysismodel.softwaresystem.architecture;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Root</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitectureRoot#getComponentTypes <em>Component Types</em>}</li>
+ * </ul>
+ *
+ * @see kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitecturePackage#getArchitectureRoot()
+ * @model
+ * @generated
+ */
+public interface ArchitectureRoot extends EObject {
+ /**
+ * Returns the value of the '<em><b>Component Types</b></em>' reference list.
+ * The list contents are of type {@link kieker.analysis.model.analysismodel.softwaresystem.architecture.ComponentType}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Component Types</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Component Types</em>' reference list.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitecturePackage#getArchitectureRoot_ComponentTypes()
+ * @model
+ * @generated
+ */
+ EList<ComponentType> getComponentTypes();
+
+} // ArchitectureRoot
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ComponentType.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ComponentType.java
index 156e5409490f9340cc2e953c75deb25ab864188d..7de25dcfc1535b711fa76f9f76dbc3697fa3c195 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ComponentType.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/ComponentType.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EObject;
* <ul>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.ComponentType#getPackageName <em>Package Name</em>}</li>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.ComponentType#getName <em>Name</em>}</li>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.ComponentType#getProvided <em>Provided</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.ComponentType#getProvidedOperations <em>Provided Operations</em>}</li>
* </ul>
*
* @see kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitecturePackage#getComponentType()
@@ -78,19 +78,19 @@ public interface ComponentType extends EObject {
void setName(String value);
/**
- * Returns the value of the '<em><b>Provided</b></em>' reference list.
+ * Returns the value of the '<em><b>Provided Operations</b></em>' reference list.
* The list contents are of type {@link kieker.analysis.model.analysismodel.softwaresystem.architecture.OperationType}.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Provided</em>' reference list isn't clear,
+ * If the meaning of the '<em>Provided Operations</em>' reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Provided</em>' reference list.
- * @see kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitecturePackage#getComponentType_Provided()
+ * @return the value of the '<em>Provided Operations</em>' reference list.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitecturePackage#getComponentType_ProvidedOperations()
* @model
* @generated
*/
- EList<OperationType> getProvided();
+ EList<OperationType> getProvidedOperations();
} // ComponentType
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ArchitectureFactoryImpl.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ArchitectureFactoryImpl.java
index 7bea4b783b0ca4cea185756280f28c6f03ce4cdd..6dd46d5f9fa7dbdfbc5d46b280883c29ee1831c9 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ArchitectureFactoryImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ArchitectureFactoryImpl.java
@@ -56,6 +56,7 @@ public class ArchitectureFactoryImpl extends EFactoryImpl implements Architectur
@Override
public EObject create(EClass eClass) {
switch (eClass.getClassifierID()) {
+ case ArchitecturePackage.ARCHITECTURE_ROOT: return createArchitectureRoot();
case ArchitecturePackage.COMPONENT_TYPE: return createComponentType();
case ArchitecturePackage.OPERATION_TYPE: return createOperationType();
default:
@@ -63,6 +64,16 @@ public class ArchitectureFactoryImpl extends EFactoryImpl implements Architectur
}
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ArchitectureRoot createArchitectureRoot() {
+ ArchitectureRootImpl architectureRoot = new ArchitectureRootImpl();
+ return architectureRoot;
+ }
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ArchitecturePackageImpl.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ArchitecturePackageImpl.java
index ddc1ffe826bded6bbaef41d15ca2b5ac5ccca60c..7d3da19354ca39c7e6e18c08273da165bc3afef6 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ArchitecturePackageImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ArchitecturePackageImpl.java
@@ -8,6 +8,7 @@ import kieker.analysis.model.analysismodel.impl.analysismodelPackageImpl;
import kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitectureFactory;
import kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitecturePackage;
+import kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitectureRoot;
import kieker.analysis.model.analysismodel.softwaresystem.architecture.ComponentType;
import kieker.analysis.model.analysismodel.softwaresystem.architecture.OperationType;
@@ -19,9 +20,9 @@ import kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPac
import kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionPackageImpl;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage;
+import kieker.analysis.model.analysismodel.statistics.StatisticsPackage;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl;
+import kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -37,6 +38,13 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
* @generated
*/
public class ArchitecturePackageImpl extends EPackageImpl implements ArchitecturePackage {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass architectureRootEClass = null;
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -126,6 +134,24 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
return theArchitecturePackage;
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getArchitectureRoot() {
+ return architectureRootEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getArchitectureRoot_ComponentTypes() {
+ return (EReference)architectureRootEClass.getEStructuralFeatures().get(0);
+ }
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -158,7 +184,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
* <!-- end-user-doc -->
* @generated
*/
- public EReference getComponentType_Provided() {
+ public EReference getComponentType_ProvidedOperations() {
return (EReference)componentTypeEClass.getEStructuralFeatures().get(2);
}
@@ -217,10 +243,13 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
isCreated = true;
// Create classes and their features
+ architectureRootEClass = createEClass(ARCHITECTURE_ROOT);
+ createEReference(architectureRootEClass, ARCHITECTURE_ROOT__COMPONENT_TYPES);
+
componentTypeEClass = createEClass(COMPONENT_TYPE);
createEAttribute(componentTypeEClass, COMPONENT_TYPE__PACKAGE_NAME);
createEAttribute(componentTypeEClass, COMPONENT_TYPE__NAME);
- createEReference(componentTypeEClass, COMPONENT_TYPE__PROVIDED);
+ createEReference(componentTypeEClass, COMPONENT_TYPE__PROVIDED_OPERATIONS);
operationTypeEClass = createEClass(OPERATION_TYPE);
createEAttribute(operationTypeEClass, OPERATION_TYPE__NAME);
@@ -257,10 +286,13 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
// Add supertypes to classes
// Initialize classes, features, and operations; add parameters
+ initEClass(architectureRootEClass, ArchitectureRoot.class, "ArchitectureRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getArchitectureRoot_ComponentTypes(), this.getComponentType(), null, "componentTypes", null, 0, -1, ArchitectureRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
initEClass(componentTypeEClass, ComponentType.class, "ComponentType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getComponentType_PackageName(), ecorePackage.getEString(), "packageName", null, 0, 1, ComponentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getComponentType_Name(), ecorePackage.getEString(), "name", null, 0, 1, ComponentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getComponentType_Provided(), this.getOperationType(), null, "provided", null, 0, -1, ComponentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getComponentType_ProvidedOperations(), this.getOperationType(), null, "providedOperations", null, 0, -1, ComponentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(operationTypeEClass, OperationType.class, "OperationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getOperationType_Name(), ecorePackage.getEString(), "name", null, 0, 1, OperationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ArchitectureRootImpl.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ArchitectureRootImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..6b0ed5d2a3dd1d6dbb8937b28f770167d6ae117a
--- /dev/null
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ArchitectureRootImpl.java
@@ -0,0 +1,134 @@
+/**
+ */
+package kieker.analysis.model.analysismodel.softwaresystem.architecture.impl;
+
+import java.util.Collection;
+
+import kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitecturePackage;
+import kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitectureRoot;
+import kieker.analysis.model.analysismodel.softwaresystem.architecture.ComponentType;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Root</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ArchitectureRootImpl#getComponentTypes <em>Component Types</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ArchitectureRootImpl extends MinimalEObjectImpl.Container implements ArchitectureRoot {
+ /**
+ * The cached value of the '{@link #getComponentTypes() <em>Component Types</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getComponentTypes()
+ * @generated
+ * @ordered
+ */
+ protected EList<ComponentType> componentTypes;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ArchitectureRootImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ArchitecturePackage.Literals.ARCHITECTURE_ROOT;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<ComponentType> getComponentTypes() {
+ if (componentTypes == null) {
+ componentTypes = new EObjectResolvingEList<ComponentType>(ComponentType.class, this, ArchitecturePackage.ARCHITECTURE_ROOT__COMPONENT_TYPES);
+ }
+ return componentTypes;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ArchitecturePackage.ARCHITECTURE_ROOT__COMPONENT_TYPES:
+ return getComponentTypes();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ArchitecturePackage.ARCHITECTURE_ROOT__COMPONENT_TYPES:
+ getComponentTypes().clear();
+ getComponentTypes().addAll((Collection<? extends ComponentType>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ArchitecturePackage.ARCHITECTURE_ROOT__COMPONENT_TYPES:
+ getComponentTypes().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ArchitecturePackage.ARCHITECTURE_ROOT__COMPONENT_TYPES:
+ return componentTypes != null && !componentTypes.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //ArchitectureRootImpl
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ComponentTypeImpl.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ComponentTypeImpl.java
index 3b9cc425863db55375fda003b82172eab59729ac..2fc7302c7ce29d9a43b53ea071c05b9be0e107dd 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ComponentTypeImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/impl/ComponentTypeImpl.java
@@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
* <ul>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ComponentTypeImpl#getPackageName <em>Package Name</em>}</li>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ComponentTypeImpl#getName <em>Name</em>}</li>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ComponentTypeImpl#getProvided <em>Provided</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.impl.ComponentTypeImpl#getProvidedOperations <em>Provided Operations</em>}</li>
* </ul>
*
* @generated
@@ -76,14 +76,14 @@ public class ComponentTypeImpl extends MinimalEObjectImpl.Container implements C
protected String name = NAME_EDEFAULT;
/**
- * The cached value of the '{@link #getProvided() <em>Provided</em>}' reference list.
+ * The cached value of the '{@link #getProvidedOperations() <em>Provided Operations</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getProvided()
+ * @see #getProvidedOperations()
* @generated
* @ordered
*/
- protected EList<OperationType> provided;
+ protected EList<OperationType> providedOperations;
/**
* <!-- begin-user-doc -->
@@ -151,11 +151,11 @@ public class ComponentTypeImpl extends MinimalEObjectImpl.Container implements C
* <!-- end-user-doc -->
* @generated
*/
- public EList<OperationType> getProvided() {
- if (provided == null) {
- provided = new EObjectResolvingEList<OperationType>(OperationType.class, this, ArchitecturePackage.COMPONENT_TYPE__PROVIDED);
+ public EList<OperationType> getProvidedOperations() {
+ if (providedOperations == null) {
+ providedOperations = new EObjectResolvingEList<OperationType>(OperationType.class, this, ArchitecturePackage.COMPONENT_TYPE__PROVIDED_OPERATIONS);
}
- return provided;
+ return providedOperations;
}
/**
@@ -170,8 +170,8 @@ public class ComponentTypeImpl extends MinimalEObjectImpl.Container implements C
return getPackageName();
case ArchitecturePackage.COMPONENT_TYPE__NAME:
return getName();
- case ArchitecturePackage.COMPONENT_TYPE__PROVIDED:
- return getProvided();
+ case ArchitecturePackage.COMPONENT_TYPE__PROVIDED_OPERATIONS:
+ return getProvidedOperations();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -191,9 +191,9 @@ public class ComponentTypeImpl extends MinimalEObjectImpl.Container implements C
case ArchitecturePackage.COMPONENT_TYPE__NAME:
setName((String)newValue);
return;
- case ArchitecturePackage.COMPONENT_TYPE__PROVIDED:
- getProvided().clear();
- getProvided().addAll((Collection<? extends OperationType>)newValue);
+ case ArchitecturePackage.COMPONENT_TYPE__PROVIDED_OPERATIONS:
+ getProvidedOperations().clear();
+ getProvidedOperations().addAll((Collection<? extends OperationType>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -213,8 +213,8 @@ public class ComponentTypeImpl extends MinimalEObjectImpl.Container implements C
case ArchitecturePackage.COMPONENT_TYPE__NAME:
setName(NAME_EDEFAULT);
return;
- case ArchitecturePackage.COMPONENT_TYPE__PROVIDED:
- getProvided().clear();
+ case ArchitecturePackage.COMPONENT_TYPE__PROVIDED_OPERATIONS:
+ getProvidedOperations().clear();
return;
}
super.eUnset(featureID);
@@ -232,8 +232,8 @@ public class ComponentTypeImpl extends MinimalEObjectImpl.Container implements C
return PACKAGE_NAME_EDEFAULT == null ? packageName != null : !PACKAGE_NAME_EDEFAULT.equals(packageName);
case ArchitecturePackage.COMPONENT_TYPE__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case ArchitecturePackage.COMPONENT_TYPE__PROVIDED:
- return provided != null && !provided.isEmpty();
+ case ArchitecturePackage.COMPONENT_TYPE__PROVIDED_OPERATIONS:
+ return providedOperations != null && !providedOperations.isEmpty();
}
return super.eIsSet(featureID);
}
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/util/ArchitectureAdapterFactory.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/util/ArchitectureAdapterFactory.java
index a056c034703087479aa0ccee3f230ede42f57085..75019867292a728d6f2d835ed6ef2651a93e05ad 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/util/ArchitectureAdapterFactory.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/util/ArchitectureAdapterFactory.java
@@ -67,6 +67,10 @@ public class ArchitectureAdapterFactory extends AdapterFactoryImpl {
*/
protected ArchitectureSwitch<Adapter> modelSwitch =
new ArchitectureSwitch<Adapter>() {
+ @Override
+ public Adapter caseArchitectureRoot(ArchitectureRoot object) {
+ return createArchitectureRootAdapter();
+ }
@Override
public Adapter caseComponentType(ComponentType object) {
return createComponentTypeAdapter();
@@ -95,6 +99,20 @@ public class ArchitectureAdapterFactory extends AdapterFactoryImpl {
}
+ /**
+ * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitectureRoot <em>Root</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.architecture.ArchitectureRoot
+ * @generated
+ */
+ public Adapter createArchitectureRootAdapter() {
+ return null;
+ }
+
/**
* Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.architecture.ComponentType <em>Component Type</em>}'.
* <!-- begin-user-doc -->
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/util/ArchitectureSwitch.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/util/ArchitectureSwitch.java
index b192ede6f3017a65ebde2fef2c08aeea9cc3aa17..9cd5104934389b1fb54587f960e0234b9f74945c 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/util/ArchitectureSwitch.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/architecture/util/ArchitectureSwitch.java
@@ -66,6 +66,12 @@ public class ArchitectureSwitch<T> extends Switch<T> {
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
switch (classifierID) {
+ case ArchitecturePackage.ARCHITECTURE_ROOT: {
+ ArchitectureRoot architectureRoot = (ArchitectureRoot)theEObject;
+ T result = caseArchitectureRoot(architectureRoot);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
case ArchitecturePackage.COMPONENT_TYPE: {
ComponentType componentType = (ComponentType)theEObject;
T result = caseComponentType(componentType);
@@ -82,6 +88,21 @@ public class ArchitectureSwitch<T> extends Switch<T> {
}
}
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Root</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Root</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseArchitectureRoot(ArchitectureRoot object) {
+ return null;
+ }
+
/**
* Returns the result of interpreting the object as an instance of '<em>Component Type</em>'.
* <!-- begin-user-doc -->
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeployedComponent.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeployedComponent.java
index 7f94b5533e2730002b474986e358939dd2275102..5b4951b7895d0bfd6e1014fd2bfdcce4b1c9db9c 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeployedComponent.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeployedComponent.java
@@ -17,9 +17,9 @@ import org.eclipse.emf.ecore.EObject;
* The following features are supported:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getContains <em>Contains</em>}</li>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getAccesses <em>Accesses</em>}</li>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getComponentType <em>Component Type</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getContainedOperations <em>Contained Operations</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getAccessedOperations <em>Accessed Operations</em>}</li>
* </ul>
*
* @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentPackage#getDeployedComponent()
@@ -28,61 +28,61 @@ import org.eclipse.emf.ecore.EObject;
*/
public interface DeployedComponent extends EObject {
/**
- * Returns the value of the '<em><b>Contains</b></em>' reference list.
- * The list contents are of type {@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedOperation}.
+ * Returns the value of the '<em><b>Component Type</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Contains</em>' reference list isn't clear,
+ * If the meaning of the '<em>Component Type</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Contains</em>' reference list.
- * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentPackage#getDeployedComponent_Contains()
+ * @return the value of the '<em>Component Type</em>' reference.
+ * @see #setComponentType(ComponentType)
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentPackage#getDeployedComponent_ComponentType()
* @model
* @generated
*/
- EList<DeployedOperation> getContains();
+ ComponentType getComponentType();
/**
- * Returns the value of the '<em><b>Accesses</b></em>' reference list.
- * The list contents are of type {@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedOperation}.
+ * Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getComponentType <em>Component Type</em>}' reference.
* <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Accesses</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Accesses</em>' reference list.
- * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentPackage#getDeployedComponent_Accesses()
- * @model
+ * @param value the new value of the '<em>Component Type</em>' reference.
+ * @see #getComponentType()
* @generated
*/
- EList<DeployedOperation> getAccesses();
+ void setComponentType(ComponentType value);
/**
- * Returns the value of the '<em><b>Component Type</b></em>' reference.
+ * Returns the value of the '<em><b>Contained Operations</b></em>' reference list.
+ * The list contents are of type {@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedOperation}.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Component Type</em>' reference isn't clear,
+ * If the meaning of the '<em>Contained Operations</em>' reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Component Type</em>' reference.
- * @see #setComponentType(ComponentType)
- * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentPackage#getDeployedComponent_ComponentType()
+ * @return the value of the '<em>Contained Operations</em>' reference list.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentPackage#getDeployedComponent_ContainedOperations()
* @model
* @generated
*/
- ComponentType getComponentType();
+ EList<DeployedOperation> getContainedOperations();
/**
- * Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getComponentType <em>Component Type</em>}' reference.
+ * Returns the value of the '<em><b>Accessed Operations</b></em>' reference list.
+ * The list contents are of type {@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedOperation}.
* <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Accessed Operations</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Component Type</em>' reference.
- * @see #getComponentType()
+ * @return the value of the '<em>Accessed Operations</em>' reference list.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentPackage#getDeployedComponent_AccessedOperations()
+ * @model
* @generated
*/
- void setComponentType(ComponentType value);
+ EList<DeployedOperation> getAccessedOperations();
} // DeployedComponent
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeploymentFactory.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeploymentFactory.java
index 4864e4ec3ab76dab544904b59a5657c110042cec..067f52927571931b1a78fdd600272800bdff2a3b 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeploymentFactory.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeploymentFactory.java
@@ -21,6 +21,15 @@ public interface DeploymentFactory extends EFactory {
*/
DeploymentFactory eINSTANCE = kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentFactoryImpl.init();
+ /**
+ * Returns a new object of class '<em>Root</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Root</em>'.
+ * @generated
+ */
+ DeploymentRoot createDeploymentRoot();
+
/**
* Returns a new object of class '<em>Context</em>'.
* <!-- begin-user-doc -->
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeploymentPackage.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeploymentPackage.java
index dbadaca315a1209d2a997e88c0f2aab918d31695..59a3b2554b2b838101add35781fdede82b9ef5ce 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeploymentPackage.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeploymentPackage.java
@@ -55,6 +55,43 @@ public interface DeploymentPackage extends EPackage {
*/
DeploymentPackage eINSTANCE = kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentPackageImpl.init();
+ /**
+ * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentRootImpl <em>Root</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentRootImpl
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentPackageImpl#getDeploymentRoot()
+ * @generated
+ */
+ int DEPLOYMENT_ROOT = 0;
+
+ /**
+ * The feature id for the '<em><b>Deployment Contexts</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DEPLOYMENT_ROOT__DEPLOYMENT_CONTEXTS = 0;
+
+ /**
+ * The number of structural features of the '<em>Root</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DEPLOYMENT_ROOT_FEATURE_COUNT = 1;
+
+ /**
+ * The number of operations of the '<em>Root</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DEPLOYMENT_ROOT_OPERATION_COUNT = 0;
+
/**
* The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentContextImpl <em>Context</em>}' class.
* <!-- begin-user-doc -->
@@ -63,7 +100,7 @@ public interface DeploymentPackage extends EPackage {
* @see kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentPackageImpl#getDeploymentContext()
* @generated
*/
- int DEPLOYMENT_CONTEXT = 0;
+ int DEPLOYMENT_CONTEXT = 1;
/**
* The feature id for the '<em><b>Components</b></em>' reference list.
@@ -100,34 +137,34 @@ public interface DeploymentPackage extends EPackage {
* @see kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentPackageImpl#getDeployedComponent()
* @generated
*/
- int DEPLOYED_COMPONENT = 1;
+ int DEPLOYED_COMPONENT = 2;
/**
- * The feature id for the '<em><b>Contains</b></em>' reference list.
+ * The feature id for the '<em><b>Component Type</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int DEPLOYED_COMPONENT__CONTAINS = 0;
+ int DEPLOYED_COMPONENT__COMPONENT_TYPE = 0;
/**
- * The feature id for the '<em><b>Accesses</b></em>' reference list.
+ * The feature id for the '<em><b>Contained Operations</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int DEPLOYED_COMPONENT__ACCESSES = 1;
+ int DEPLOYED_COMPONENT__CONTAINED_OPERATIONS = 1;
/**
- * The feature id for the '<em><b>Component Type</b></em>' reference.
+ * The feature id for the '<em><b>Accessed Operations</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int DEPLOYED_COMPONENT__COMPONENT_TYPE = 2;
+ int DEPLOYED_COMPONENT__ACCESSED_OPERATIONS = 2;
/**
* The number of structural features of the '<em>Deployed Component</em>' class.
@@ -155,7 +192,7 @@ public interface DeploymentPackage extends EPackage {
* @see kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentPackageImpl#getDeployedOperation()
* @generated
*/
- int DEPLOYED_OPERATION = 2;
+ int DEPLOYED_OPERATION = 3;
/**
* The feature id for the '<em><b>Operation Type</b></em>' reference.
@@ -185,6 +222,27 @@ public interface DeploymentPackage extends EPackage {
int DEPLOYED_OPERATION_OPERATION_COUNT = 0;
+ /**
+ * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentRoot <em>Root</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Root</em>'.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentRoot
+ * @generated
+ */
+ EClass getDeploymentRoot();
+
+ /**
+ * Returns the meta object for the reference list '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentRoot#getDeploymentContexts <em>Deployment Contexts</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Deployment Contexts</em>'.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentRoot#getDeploymentContexts()
+ * @see #getDeploymentRoot()
+ * @generated
+ */
+ EReference getDeploymentRoot_DeploymentContexts();
+
/**
* Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentContext <em>Context</em>}'.
* <!-- begin-user-doc -->
@@ -217,37 +275,37 @@ public interface DeploymentPackage extends EPackage {
EClass getDeployedComponent();
/**
- * Returns the meta object for the reference list '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getContains <em>Contains</em>}'.
+ * Returns the meta object for the reference '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getComponentType <em>Component Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Contains</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getContains()
+ * @return the meta object for the reference '<em>Component Type</em>'.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getComponentType()
* @see #getDeployedComponent()
* @generated
*/
- EReference getDeployedComponent_Contains();
+ EReference getDeployedComponent_ComponentType();
/**
- * Returns the meta object for the reference list '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getAccesses <em>Accesses</em>}'.
+ * Returns the meta object for the reference list '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getContainedOperations <em>Contained Operations</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Accesses</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getAccesses()
+ * @return the meta object for the reference list '<em>Contained Operations</em>'.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getContainedOperations()
* @see #getDeployedComponent()
* @generated
*/
- EReference getDeployedComponent_Accesses();
+ EReference getDeployedComponent_ContainedOperations();
/**
- * Returns the meta object for the reference '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getComponentType <em>Component Type</em>}'.
+ * Returns the meta object for the reference list '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getAccessedOperations <em>Accessed Operations</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Component Type</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getComponentType()
+ * @return the meta object for the reference list '<em>Accessed Operations</em>'.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedComponent#getAccessedOperations()
* @see #getDeployedComponent()
* @generated
*/
- EReference getDeployedComponent_ComponentType();
+ EReference getDeployedComponent_AccessedOperations();
/**
* Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedOperation <em>Deployed Operation</em>}'.
@@ -293,6 +351,24 @@ public interface DeploymentPackage extends EPackage {
* @generated
*/
interface Literals {
+ /**
+ * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentRootImpl <em>Root</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentRootImpl
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentPackageImpl#getDeploymentRoot()
+ * @generated
+ */
+ EClass DEPLOYMENT_ROOT = eINSTANCE.getDeploymentRoot();
+
+ /**
+ * The meta object literal for the '<em><b>Deployment Contexts</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference DEPLOYMENT_ROOT__DEPLOYMENT_CONTEXTS = eINSTANCE.getDeploymentRoot_DeploymentContexts();
+
/**
* The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentContextImpl <em>Context</em>}' class.
* <!-- begin-user-doc -->
@@ -322,28 +398,28 @@ public interface DeploymentPackage extends EPackage {
EClass DEPLOYED_COMPONENT = eINSTANCE.getDeployedComponent();
/**
- * The meta object literal for the '<em><b>Contains</b></em>' reference list feature.
+ * The meta object literal for the '<em><b>Component Type</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference DEPLOYED_COMPONENT__CONTAINS = eINSTANCE.getDeployedComponent_Contains();
+ EReference DEPLOYED_COMPONENT__COMPONENT_TYPE = eINSTANCE.getDeployedComponent_ComponentType();
/**
- * The meta object literal for the '<em><b>Accesses</b></em>' reference list feature.
+ * The meta object literal for the '<em><b>Contained Operations</b></em>' reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference DEPLOYED_COMPONENT__ACCESSES = eINSTANCE.getDeployedComponent_Accesses();
+ EReference DEPLOYED_COMPONENT__CONTAINED_OPERATIONS = eINSTANCE.getDeployedComponent_ContainedOperations();
/**
- * The meta object literal for the '<em><b>Component Type</b></em>' reference feature.
+ * The meta object literal for the '<em><b>Accessed Operations</b></em>' reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference DEPLOYED_COMPONENT__COMPONENT_TYPE = eINSTANCE.getDeployedComponent_ComponentType();
+ EReference DEPLOYED_COMPONENT__ACCESSED_OPERATIONS = eINSTANCE.getDeployedComponent_AccessedOperations();
/**
* The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeployedOperationImpl <em>Deployed Operation</em>}' class.
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeploymentRoot.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeploymentRoot.java
new file mode 100644
index 0000000000000000000000000000000000000000..17960d9c028390fb161e35f212e64ffacea77e4a
--- /dev/null
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/DeploymentRoot.java
@@ -0,0 +1,42 @@
+/**
+ */
+package kieker.analysis.model.analysismodel.softwaresystem.deployment;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Root</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentRoot#getDeploymentContexts <em>Deployment Contexts</em>}</li>
+ * </ul>
+ *
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentPackage#getDeploymentRoot()
+ * @model
+ * @generated
+ */
+public interface DeploymentRoot extends EObject {
+ /**
+ * Returns the value of the '<em><b>Deployment Contexts</b></em>' reference list.
+ * The list contents are of type {@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentContext}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Deployment Contexts</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Deployment Contexts</em>' reference list.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentPackage#getDeploymentRoot_DeploymentContexts()
+ * @model
+ * @generated
+ */
+ EList<DeploymentContext> getDeploymentContexts();
+
+} // DeploymentRoot
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeployedComponentImpl.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeployedComponentImpl.java
index 40ec7bb326773ed43d295d69d991c0917aa7f0ce..7e7727ab9e8743ce489120a02e28b4f1a402ca5c 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeployedComponentImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeployedComponentImpl.java
@@ -30,43 +30,43 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeployedComponentImpl#getContains <em>Contains</em>}</li>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeployedComponentImpl#getAccesses <em>Accesses</em>}</li>
* <li>{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeployedComponentImpl#getComponentType <em>Component Type</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeployedComponentImpl#getContainedOperations <em>Contained Operations</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeployedComponentImpl#getAccessedOperations <em>Accessed Operations</em>}</li>
* </ul>
*
* @generated
*/
public class DeployedComponentImpl extends MinimalEObjectImpl.Container implements DeployedComponent {
/**
- * The cached value of the '{@link #getContains() <em>Contains</em>}' reference list.
+ * The cached value of the '{@link #getComponentType() <em>Component Type</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getContains()
+ * @see #getComponentType()
* @generated
* @ordered
*/
- protected EList<DeployedOperation> contains;
+ protected ComponentType componentType;
/**
- * The cached value of the '{@link #getAccesses() <em>Accesses</em>}' reference list.
+ * The cached value of the '{@link #getContainedOperations() <em>Contained Operations</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getAccesses()
+ * @see #getContainedOperations()
* @generated
* @ordered
*/
- protected EList<DeployedOperation> accesses;
+ protected EList<DeployedOperation> containedOperations;
/**
- * The cached value of the '{@link #getComponentType() <em>Component Type</em>}' reference.
+ * The cached value of the '{@link #getAccessedOperations() <em>Accessed Operations</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getComponentType()
+ * @see #getAccessedOperations()
* @generated
* @ordered
*/
- protected ComponentType componentType;
+ protected EList<DeployedOperation> accessedOperations;
/**
* <!-- begin-user-doc -->
@@ -87,30 +87,6 @@ public class DeployedComponentImpl extends MinimalEObjectImpl.Container implemen
return DeploymentPackage.Literals.DEPLOYED_COMPONENT;
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<DeployedOperation> getContains() {
- if (contains == null) {
- contains = new EObjectResolvingEList<DeployedOperation>(DeployedOperation.class, this, DeploymentPackage.DEPLOYED_COMPONENT__CONTAINS);
- }
- return contains;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<DeployedOperation> getAccesses() {
- if (accesses == null) {
- accesses = new EObjectResolvingEList<DeployedOperation>(DeployedOperation.class, this, DeploymentPackage.DEPLOYED_COMPONENT__ACCESSES);
- }
- return accesses;
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -149,6 +125,30 @@ public class DeployedComponentImpl extends MinimalEObjectImpl.Container implemen
eNotify(new ENotificationImpl(this, Notification.SET, DeploymentPackage.DEPLOYED_COMPONENT__COMPONENT_TYPE, oldComponentType, componentType));
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<DeployedOperation> getContainedOperations() {
+ if (containedOperations == null) {
+ containedOperations = new EObjectResolvingEList<DeployedOperation>(DeployedOperation.class, this, DeploymentPackage.DEPLOYED_COMPONENT__CONTAINED_OPERATIONS);
+ }
+ return containedOperations;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<DeployedOperation> getAccessedOperations() {
+ if (accessedOperations == null) {
+ accessedOperations = new EObjectResolvingEList<DeployedOperation>(DeployedOperation.class, this, DeploymentPackage.DEPLOYED_COMPONENT__ACCESSED_OPERATIONS);
+ }
+ return accessedOperations;
+ }
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -157,13 +157,13 @@ public class DeployedComponentImpl extends MinimalEObjectImpl.Container implemen
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case DeploymentPackage.DEPLOYED_COMPONENT__CONTAINS:
- return getContains();
- case DeploymentPackage.DEPLOYED_COMPONENT__ACCESSES:
- return getAccesses();
case DeploymentPackage.DEPLOYED_COMPONENT__COMPONENT_TYPE:
if (resolve) return getComponentType();
return basicGetComponentType();
+ case DeploymentPackage.DEPLOYED_COMPONENT__CONTAINED_OPERATIONS:
+ return getContainedOperations();
+ case DeploymentPackage.DEPLOYED_COMPONENT__ACCESSED_OPERATIONS:
+ return getAccessedOperations();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -177,17 +177,17 @@ public class DeployedComponentImpl extends MinimalEObjectImpl.Container implemen
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case DeploymentPackage.DEPLOYED_COMPONENT__CONTAINS:
- getContains().clear();
- getContains().addAll((Collection<? extends DeployedOperation>)newValue);
- return;
- case DeploymentPackage.DEPLOYED_COMPONENT__ACCESSES:
- getAccesses().clear();
- getAccesses().addAll((Collection<? extends DeployedOperation>)newValue);
- return;
case DeploymentPackage.DEPLOYED_COMPONENT__COMPONENT_TYPE:
setComponentType((ComponentType)newValue);
return;
+ case DeploymentPackage.DEPLOYED_COMPONENT__CONTAINED_OPERATIONS:
+ getContainedOperations().clear();
+ getContainedOperations().addAll((Collection<? extends DeployedOperation>)newValue);
+ return;
+ case DeploymentPackage.DEPLOYED_COMPONENT__ACCESSED_OPERATIONS:
+ getAccessedOperations().clear();
+ getAccessedOperations().addAll((Collection<? extends DeployedOperation>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -200,15 +200,15 @@ public class DeployedComponentImpl extends MinimalEObjectImpl.Container implemen
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case DeploymentPackage.DEPLOYED_COMPONENT__CONTAINS:
- getContains().clear();
- return;
- case DeploymentPackage.DEPLOYED_COMPONENT__ACCESSES:
- getAccesses().clear();
- return;
case DeploymentPackage.DEPLOYED_COMPONENT__COMPONENT_TYPE:
setComponentType((ComponentType)null);
return;
+ case DeploymentPackage.DEPLOYED_COMPONENT__CONTAINED_OPERATIONS:
+ getContainedOperations().clear();
+ return;
+ case DeploymentPackage.DEPLOYED_COMPONENT__ACCESSED_OPERATIONS:
+ getAccessedOperations().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -221,12 +221,12 @@ public class DeployedComponentImpl extends MinimalEObjectImpl.Container implemen
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case DeploymentPackage.DEPLOYED_COMPONENT__CONTAINS:
- return contains != null && !contains.isEmpty();
- case DeploymentPackage.DEPLOYED_COMPONENT__ACCESSES:
- return accesses != null && !accesses.isEmpty();
case DeploymentPackage.DEPLOYED_COMPONENT__COMPONENT_TYPE:
return componentType != null;
+ case DeploymentPackage.DEPLOYED_COMPONENT__CONTAINED_OPERATIONS:
+ return containedOperations != null && !containedOperations.isEmpty();
+ case DeploymentPackage.DEPLOYED_COMPONENT__ACCESSED_OPERATIONS:
+ return accessedOperations != null && !accessedOperations.isEmpty();
}
return super.eIsSet(featureID);
}
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeploymentFactoryImpl.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeploymentFactoryImpl.java
index 220f5e3e47f5689e7045021b8268665d03557807..2e8a191fc01d546bad1d9891f07bc64ac901a9cf 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeploymentFactoryImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeploymentFactoryImpl.java
@@ -56,6 +56,7 @@ public class DeploymentFactoryImpl extends EFactoryImpl implements DeploymentFac
@Override
public EObject create(EClass eClass) {
switch (eClass.getClassifierID()) {
+ case DeploymentPackage.DEPLOYMENT_ROOT: return createDeploymentRoot();
case DeploymentPackage.DEPLOYMENT_CONTEXT: return createDeploymentContext();
case DeploymentPackage.DEPLOYED_COMPONENT: return createDeployedComponent();
case DeploymentPackage.DEPLOYED_OPERATION: return createDeployedOperation();
@@ -64,6 +65,16 @@ public class DeploymentFactoryImpl extends EFactoryImpl implements DeploymentFac
}
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public DeploymentRoot createDeploymentRoot() {
+ DeploymentRootImpl deploymentRoot = new DeploymentRootImpl();
+ return deploymentRoot;
+ }
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeploymentPackageImpl.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeploymentPackageImpl.java
index 368f38f35dd5d3a2df4a2fb71dbc9a93bd0d5e30..154ab23afd203a1e4659c57d30004fe29e7c8b50 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeploymentPackageImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeploymentPackageImpl.java
@@ -15,14 +15,15 @@ import kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedOpe
import kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentContext;
import kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentFactory;
import kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentPackage;
+import kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentRoot;
import kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage;
import kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionPackageImpl;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage;
+import kieker.analysis.model.analysismodel.statistics.StatisticsPackage;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl;
+import kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
@@ -37,6 +38,13 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
* @generated
*/
public class DeploymentPackageImpl extends EPackageImpl implements DeploymentPackage {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass deploymentRootEClass = null;
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -133,6 +141,24 @@ public class DeploymentPackageImpl extends EPackageImpl implements DeploymentPac
return theDeploymentPackage;
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getDeploymentRoot() {
+ return deploymentRootEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getDeploymentRoot_DeploymentContexts() {
+ return (EReference)deploymentRootEClass.getEStructuralFeatures().get(0);
+ }
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -165,7 +191,7 @@ public class DeploymentPackageImpl extends EPackageImpl implements DeploymentPac
* <!-- end-user-doc -->
* @generated
*/
- public EReference getDeployedComponent_Contains() {
+ public EReference getDeployedComponent_ComponentType() {
return (EReference)deployedComponentEClass.getEStructuralFeatures().get(0);
}
@@ -174,7 +200,7 @@ public class DeploymentPackageImpl extends EPackageImpl implements DeploymentPac
* <!-- end-user-doc -->
* @generated
*/
- public EReference getDeployedComponent_Accesses() {
+ public EReference getDeployedComponent_ContainedOperations() {
return (EReference)deployedComponentEClass.getEStructuralFeatures().get(1);
}
@@ -183,7 +209,7 @@ public class DeploymentPackageImpl extends EPackageImpl implements DeploymentPac
* <!-- end-user-doc -->
* @generated
*/
- public EReference getDeployedComponent_ComponentType() {
+ public EReference getDeployedComponent_AccessedOperations() {
return (EReference)deployedComponentEClass.getEStructuralFeatures().get(2);
}
@@ -233,13 +259,16 @@ public class DeploymentPackageImpl extends EPackageImpl implements DeploymentPac
isCreated = true;
// Create classes and their features
+ deploymentRootEClass = createEClass(DEPLOYMENT_ROOT);
+ createEReference(deploymentRootEClass, DEPLOYMENT_ROOT__DEPLOYMENT_CONTEXTS);
+
deploymentContextEClass = createEClass(DEPLOYMENT_CONTEXT);
createEReference(deploymentContextEClass, DEPLOYMENT_CONTEXT__COMPONENTS);
deployedComponentEClass = createEClass(DEPLOYED_COMPONENT);
- createEReference(deployedComponentEClass, DEPLOYED_COMPONENT__CONTAINS);
- createEReference(deployedComponentEClass, DEPLOYED_COMPONENT__ACCESSES);
createEReference(deployedComponentEClass, DEPLOYED_COMPONENT__COMPONENT_TYPE);
+ createEReference(deployedComponentEClass, DEPLOYED_COMPONENT__CONTAINED_OPERATIONS);
+ createEReference(deployedComponentEClass, DEPLOYED_COMPONENT__ACCESSED_OPERATIONS);
deployedOperationEClass = createEClass(DEPLOYED_OPERATION);
createEReference(deployedOperationEClass, DEPLOYED_OPERATION__OPERATION_TYPE);
@@ -278,13 +307,16 @@ public class DeploymentPackageImpl extends EPackageImpl implements DeploymentPac
// Add supertypes to classes
// Initialize classes, features, and operations; add parameters
+ initEClass(deploymentRootEClass, DeploymentRoot.class, "DeploymentRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getDeploymentRoot_DeploymentContexts(), this.getDeploymentContext(), null, "deploymentContexts", null, 0, -1, DeploymentRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
initEClass(deploymentContextEClass, DeploymentContext.class, "DeploymentContext", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getDeploymentContext_Components(), this.getDeployedComponent(), null, "components", null, 0, -1, DeploymentContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(deployedComponentEClass, DeployedComponent.class, "DeployedComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getDeployedComponent_Contains(), this.getDeployedOperation(), null, "contains", null, 0, -1, DeployedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getDeployedComponent_Accesses(), this.getDeployedOperation(), null, "accesses", null, 0, -1, DeployedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getDeployedComponent_ComponentType(), theArchitecturePackage.getComponentType(), null, "componentType", null, 0, 1, DeployedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getDeployedComponent_ContainedOperations(), this.getDeployedOperation(), null, "containedOperations", null, 0, -1, DeployedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getDeployedComponent_AccessedOperations(), this.getDeployedOperation(), null, "accessedOperations", null, 0, -1, DeployedComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(deployedOperationEClass, DeployedOperation.class, "DeployedOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getDeployedOperation_OperationType(), theArchitecturePackage.getOperationType(), null, "operationType", null, 0, 1, DeployedOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeploymentRootImpl.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeploymentRootImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..192f405eb08beddc26f234d08e8423dcd74802e3
--- /dev/null
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/impl/DeploymentRootImpl.java
@@ -0,0 +1,134 @@
+/**
+ */
+package kieker.analysis.model.analysismodel.softwaresystem.deployment.impl;
+
+import java.util.Collection;
+
+import kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentContext;
+import kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentPackage;
+import kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentRoot;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Root</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentRootImpl#getDeploymentContexts <em>Deployment Contexts</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class DeploymentRootImpl extends MinimalEObjectImpl.Container implements DeploymentRoot {
+ /**
+ * The cached value of the '{@link #getDeploymentContexts() <em>Deployment Contexts</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDeploymentContexts()
+ * @generated
+ * @ordered
+ */
+ protected EList<DeploymentContext> deploymentContexts;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected DeploymentRootImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return DeploymentPackage.Literals.DEPLOYMENT_ROOT;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<DeploymentContext> getDeploymentContexts() {
+ if (deploymentContexts == null) {
+ deploymentContexts = new EObjectResolvingEList<DeploymentContext>(DeploymentContext.class, this, DeploymentPackage.DEPLOYMENT_ROOT__DEPLOYMENT_CONTEXTS);
+ }
+ return deploymentContexts;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case DeploymentPackage.DEPLOYMENT_ROOT__DEPLOYMENT_CONTEXTS:
+ return getDeploymentContexts();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case DeploymentPackage.DEPLOYMENT_ROOT__DEPLOYMENT_CONTEXTS:
+ getDeploymentContexts().clear();
+ getDeploymentContexts().addAll((Collection<? extends DeploymentContext>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case DeploymentPackage.DEPLOYMENT_ROOT__DEPLOYMENT_CONTEXTS:
+ getDeploymentContexts().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case DeploymentPackage.DEPLOYMENT_ROOT__DEPLOYMENT_CONTEXTS:
+ return deploymentContexts != null && !deploymentContexts.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //DeploymentRootImpl
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/util/DeploymentAdapterFactory.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/util/DeploymentAdapterFactory.java
index 77d14ce0d689f292ebc56f128ae936da4671ba4c..27816a288b987c317c77e5f8ddf077bc3474b912 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/util/DeploymentAdapterFactory.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/util/DeploymentAdapterFactory.java
@@ -67,6 +67,10 @@ public class DeploymentAdapterFactory extends AdapterFactoryImpl {
*/
protected DeploymentSwitch<Adapter> modelSwitch =
new DeploymentSwitch<Adapter>() {
+ @Override
+ public Adapter caseDeploymentRoot(DeploymentRoot object) {
+ return createDeploymentRootAdapter();
+ }
@Override
public Adapter caseDeploymentContext(DeploymentContext object) {
return createDeploymentContextAdapter();
@@ -99,6 +103,20 @@ public class DeploymentAdapterFactory extends AdapterFactoryImpl {
}
+ /**
+ * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentRoot <em>Root</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentRoot
+ * @generated
+ */
+ public Adapter createDeploymentRootAdapter() {
+ return null;
+ }
+
/**
* Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentContext <em>Context</em>}'.
* <!-- begin-user-doc -->
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/util/DeploymentSwitch.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/util/DeploymentSwitch.java
index 6ba6049d255d020edf3c1ec4f29716b9f5463b0e..8948521d54d7853514dad231b06c0c8a1dcf8316 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/util/DeploymentSwitch.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/deployment/util/DeploymentSwitch.java
@@ -66,6 +66,12 @@ public class DeploymentSwitch<T> extends Switch<T> {
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
switch (classifierID) {
+ case DeploymentPackage.DEPLOYMENT_ROOT: {
+ DeploymentRoot deploymentRoot = (DeploymentRoot)theEObject;
+ T result = caseDeploymentRoot(deploymentRoot);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
case DeploymentPackage.DEPLOYMENT_CONTEXT: {
DeploymentContext deploymentContext = (DeploymentContext)theEObject;
T result = caseDeploymentContext(deploymentContext);
@@ -88,6 +94,21 @@ public class DeploymentSwitch<T> extends Switch<T> {
}
}
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Root</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Root</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseDeploymentRoot(DeploymentRoot object) {
+ return null;
+ }
+
/**
* Returns the result of interpreting the object as an instance of '<em>Context</em>'.
* <!-- begin-user-doc -->
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/aggregatedInvocation.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/AggregatedInvocation.java
similarity index 79%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/aggregatedInvocation.java
rename to src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/AggregatedInvocation.java
index 715fface93d0156210c357740e054843ca4ea7c5..a96477402e9afff6415b6a6e6ea90a4dff106ca1 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/aggregatedInvocation.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/AggregatedInvocation.java
@@ -8,22 +8,22 @@ import org.eclipse.emf.ecore.EObject;
/**
* <!-- begin-user-doc -->
- * A representation of the model object '<em><b>aggregated Invocation</b></em>'.
+ * A representation of the model object '<em><b>Aggregated Invocation</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* </p>
* <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#getSource <em>Source</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getTarget <em>Target</em>}</li>
* </ul>
*
- * @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage#getaggregatedInvocation()
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage#getAggregatedInvocation()
* @model
* @generated
*/
-public interface aggregatedInvocation extends EObject {
+public interface AggregatedInvocation extends EObject {
/**
* Returns the value of the '<em><b>Source</b></em>' reference.
* <!-- begin-user-doc -->
@@ -34,14 +34,14 @@ public interface aggregatedInvocation extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Source</em>' reference.
* @see #setSource(DeployedOperation)
- * @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage#getaggregatedInvocation_Source()
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage#getAggregatedInvocation_Source()
* @model
* @generated
*/
DeployedOperation getSource();
/**
- * Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.aggregatedInvocation#getSource <em>Source</em>}' reference.
+ * Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getSource <em>Source</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Source</em>' reference.
@@ -60,14 +60,14 @@ public interface aggregatedInvocation extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Target</em>' reference.
* @see #setTarget(DeployedOperation)
- * @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage#getaggregatedInvocation_Target()
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage#getAggregatedInvocation_Target()
* @model
* @generated
*/
DeployedOperation getTarget();
/**
- * Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.aggregatedInvocation#getTarget <em>Target</em>}' reference.
+ * Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getTarget <em>Target</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Target</em>' reference.
@@ -76,4 +76,4 @@ public interface aggregatedInvocation extends EObject {
*/
void setTarget(DeployedOperation value);
-} // aggregatedInvocation
+} // AggregatedInvocation
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/ExecutionFactory.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/ExecutionFactory.java
index 97988e4a09ebab5b24257d96bf5889dbfa8367ec..fbec3d33c0c76288df963cdc336c117339a45dab 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/ExecutionFactory.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/ExecutionFactory.java
@@ -22,13 +22,22 @@ public interface ExecutionFactory extends EFactory {
ExecutionFactory eINSTANCE = kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionFactoryImpl.init();
/**
- * Returns a new object of class '<em>aggregated Invocation</em>'.
+ * Returns a new object of class '<em>Root</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>aggregated Invocation</em>'.
+ * @return a new object of class '<em>Root</em>'.
* @generated
*/
- aggregatedInvocation createaggregatedInvocation();
+ ExecutionRoot createExecutionRoot();
+
+ /**
+ * Returns a new object of class '<em>Aggregated Invocation</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Aggregated Invocation</em>'.
+ * @generated
+ */
+ AggregatedInvocation createAggregatedInvocation();
/**
* Returns the package supported by this factory.
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/ExecutionPackage.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/ExecutionPackage.java
index d4259d91f3d74b244612f32cbece9f842710d9c5..0239b307db0179d30cd5e47da7c55a168465682e 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/ExecutionPackage.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/ExecutionPackage.java
@@ -56,14 +56,51 @@ public interface ExecutionPackage extends EPackage {
ExecutionPackage eINSTANCE = kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionPackageImpl.init();
/**
- * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.impl.aggregatedInvocationImpl <em>aggregated Invocation</em>}' class.
+ * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionRootImpl <em>Root</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.execution.impl.aggregatedInvocationImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionPackageImpl#getaggregatedInvocation()
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionRootImpl
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionPackageImpl#getExecutionRoot()
* @generated
*/
- int AGGREGATED_INVOCATION = 0;
+ int EXECUTION_ROOT = 0;
+
+ /**
+ * The feature id for the '<em><b>Aggregated Invocations</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXECUTION_ROOT__AGGREGATED_INVOCATIONS = 0;
+
+ /**
+ * The number of structural features of the '<em>Root</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXECUTION_ROOT_FEATURE_COUNT = 1;
+
+ /**
+ * The number of operations of the '<em>Root</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXECUTION_ROOT_OPERATION_COUNT = 0;
+
+ /**
+ * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.impl.AggregatedInvocationImpl <em>Aggregated Invocation</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.impl.AggregatedInvocationImpl
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionPackageImpl#getAggregatedInvocation()
+ * @generated
+ */
+ int AGGREGATED_INVOCATION = 1;
/**
* The feature id for the '<em><b>Source</b></em>' reference.
@@ -84,7 +121,7 @@ public interface ExecutionPackage extends EPackage {
int AGGREGATED_INVOCATION__TARGET = 1;
/**
- * The number of structural features of the '<em>aggregated Invocation</em>' class.
+ * The number of structural features of the '<em>Aggregated Invocation</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -93,7 +130,7 @@ public interface ExecutionPackage extends EPackage {
int AGGREGATED_INVOCATION_FEATURE_COUNT = 2;
/**
- * The number of operations of the '<em>aggregated Invocation</em>' class.
+ * The number of operations of the '<em>Aggregated Invocation</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -103,36 +140,57 @@ public interface ExecutionPackage extends EPackage {
/**
- * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.aggregatedInvocation <em>aggregated Invocation</em>}'.
+ * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionRoot <em>Root</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Root</em>'.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionRoot
+ * @generated
+ */
+ EClass getExecutionRoot();
+
+ /**
+ * Returns the meta object for the reference list '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionRoot#getAggregatedInvocations <em>Aggregated Invocations</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Aggregated Invocations</em>'.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionRoot#getAggregatedInvocations()
+ * @see #getExecutionRoot()
+ * @generated
+ */
+ EReference getExecutionRoot_AggregatedInvocations();
+
+ /**
+ * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation <em>Aggregated Invocation</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>aggregated Invocation</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.execution.aggregatedInvocation
+ * @return the meta object for class '<em>Aggregated Invocation</em>'.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation
* @generated
*/
- EClass getaggregatedInvocation();
+ EClass getAggregatedInvocation();
/**
- * Returns the meta object for the reference '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.aggregatedInvocation#getSource <em>Source</em>}'.
+ * Returns the meta object for the reference '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getSource <em>Source</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Source</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.execution.aggregatedInvocation#getSource()
- * @see #getaggregatedInvocation()
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getSource()
+ * @see #getAggregatedInvocation()
* @generated
*/
- EReference getaggregatedInvocation_Source();
+ EReference getAggregatedInvocation_Source();
/**
- * Returns the meta object for the reference '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.aggregatedInvocation#getTarget <em>Target</em>}'.
+ * Returns the meta object for the reference '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getTarget <em>Target</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Target</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.execution.aggregatedInvocation#getTarget()
- * @see #getaggregatedInvocation()
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation#getTarget()
+ * @see #getAggregatedInvocation()
* @generated
*/
- EReference getaggregatedInvocation_Target();
+ EReference getAggregatedInvocation_Target();
/**
* Returns the factory that creates the instances of the model.
@@ -158,14 +216,32 @@ public interface ExecutionPackage extends EPackage {
*/
interface Literals {
/**
- * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.impl.aggregatedInvocationImpl <em>aggregated Invocation</em>}' class.
+ * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionRootImpl <em>Root</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionRootImpl
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionPackageImpl#getExecutionRoot()
+ * @generated
+ */
+ EClass EXECUTION_ROOT = eINSTANCE.getExecutionRoot();
+
+ /**
+ * The meta object literal for the '<em><b>Aggregated Invocations</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference EXECUTION_ROOT__AGGREGATED_INVOCATIONS = eINSTANCE.getExecutionRoot_AggregatedInvocations();
+
+ /**
+ * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.impl.AggregatedInvocationImpl <em>Aggregated Invocation</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.execution.impl.aggregatedInvocationImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionPackageImpl#getaggregatedInvocation()
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.impl.AggregatedInvocationImpl
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionPackageImpl#getAggregatedInvocation()
* @generated
*/
- EClass AGGREGATED_INVOCATION = eINSTANCE.getaggregatedInvocation();
+ EClass AGGREGATED_INVOCATION = eINSTANCE.getAggregatedInvocation();
/**
* The meta object literal for the '<em><b>Source</b></em>' reference feature.
@@ -173,7 +249,7 @@ public interface ExecutionPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- EReference AGGREGATED_INVOCATION__SOURCE = eINSTANCE.getaggregatedInvocation_Source();
+ EReference AGGREGATED_INVOCATION__SOURCE = eINSTANCE.getAggregatedInvocation_Source();
/**
* The meta object literal for the '<em><b>Target</b></em>' reference feature.
@@ -181,7 +257,7 @@ public interface ExecutionPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- EReference AGGREGATED_INVOCATION__TARGET = eINSTANCE.getaggregatedInvocation_Target();
+ EReference AGGREGATED_INVOCATION__TARGET = eINSTANCE.getAggregatedInvocation_Target();
}
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/ExecutionRoot.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/ExecutionRoot.java
new file mode 100644
index 0000000000000000000000000000000000000000..b477e9d8d614c5f77b86c93ccb7b305d017b67f8
--- /dev/null
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/ExecutionRoot.java
@@ -0,0 +1,42 @@
+/**
+ */
+package kieker.analysis.model.analysismodel.softwaresystem.execution;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Root</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionRoot#getAggregatedInvocations <em>Aggregated Invocations</em>}</li>
+ * </ul>
+ *
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage#getExecutionRoot()
+ * @model
+ * @generated
+ */
+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}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Aggregated Invocations</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Aggregated Invocations</em>' reference list.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage#getExecutionRoot_AggregatedInvocations()
+ * @model
+ * @generated
+ */
+ EList<AggregatedInvocation> getAggregatedInvocations();
+
+} // ExecutionRoot
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/aggregatedInvocationImpl.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/AggregatedInvocationImpl.java
similarity index 93%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/aggregatedInvocationImpl.java
rename to src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/AggregatedInvocationImpl.java
index 5d340c2513b10d406f9fadc4986351bbe599bffb..29d5ee41fb4c40ac3607acc4cc88bb49aaac8dfc 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/aggregatedInvocationImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/AggregatedInvocationImpl.java
@@ -4,8 +4,8 @@ package kieker.analysis.model.analysismodel.softwaresystem.execution.impl;
import kieker.analysis.model.analysismodel.softwaresystem.deployment.DeployedOperation;
+import kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation;
import kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage;
-import kieker.analysis.model.analysismodel.softwaresystem.execution.aggregatedInvocation;
import org.eclipse.emf.common.notify.Notification;
@@ -17,19 +17,19 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
/**
* <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>aggregated Invocation</b></em>'.
+ * An implementation of the model object '<em><b>Aggregated Invocation</b></em>'.
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* </p>
* <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#getSource <em>Source</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.execution.impl.AggregatedInvocationImpl#getTarget <em>Target</em>}</li>
* </ul>
*
* @generated
*/
-public class aggregatedInvocationImpl extends MinimalEObjectImpl.Container implements aggregatedInvocation {
+public class AggregatedInvocationImpl extends MinimalEObjectImpl.Container implements AggregatedInvocation {
/**
* The cached value of the '{@link #getSource() <em>Source</em>}' reference.
* <!-- begin-user-doc -->
@@ -55,7 +55,7 @@ public class aggregatedInvocationImpl extends MinimalEObjectImpl.Container imple
* <!-- end-user-doc -->
* @generated
*/
- protected aggregatedInvocationImpl() {
+ protected AggregatedInvocationImpl() {
super();
}
@@ -215,4 +215,4 @@ public class aggregatedInvocationImpl extends MinimalEObjectImpl.Container imple
return super.eIsSet(featureID);
}
-} //aggregatedInvocationImpl
+} //AggregatedInvocationImpl
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/ExecutionFactoryImpl.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/ExecutionFactoryImpl.java
index 8ebf2d30788b508097eb616288a2721bf10e5b52..3a2630f6f807d6a9d20102dde0b4b197bab931ff 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/ExecutionFactoryImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/ExecutionFactoryImpl.java
@@ -56,7 +56,8 @@ public class ExecutionFactoryImpl extends EFactoryImpl implements ExecutionFacto
@Override
public EObject create(EClass eClass) {
switch (eClass.getClassifierID()) {
- case ExecutionPackage.AGGREGATED_INVOCATION: return createaggregatedInvocation();
+ case ExecutionPackage.EXECUTION_ROOT: return createExecutionRoot();
+ case ExecutionPackage.AGGREGATED_INVOCATION: return createAggregatedInvocation();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -67,8 +68,18 @@ public class ExecutionFactoryImpl extends EFactoryImpl implements ExecutionFacto
* <!-- end-user-doc -->
* @generated
*/
- public aggregatedInvocation createaggregatedInvocation() {
- aggregatedInvocationImpl aggregatedInvocation = new aggregatedInvocationImpl();
+ public ExecutionRoot createExecutionRoot() {
+ ExecutionRootImpl executionRoot = new ExecutionRootImpl();
+ return executionRoot;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public AggregatedInvocation createAggregatedInvocation() {
+ AggregatedInvocationImpl aggregatedInvocation = new AggregatedInvocationImpl();
return aggregatedInvocation;
}
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/ExecutionPackageImpl.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/ExecutionPackageImpl.java
index 50f91480db7d4913a247a533c0bcb6d9545c9ed9..3674de94c6a311b475483713ae8e525462713f30 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/ExecutionPackageImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/ExecutionPackageImpl.java
@@ -14,13 +14,14 @@ import kieker.analysis.model.analysismodel.softwaresystem.deployment.DeploymentP
import kieker.analysis.model.analysismodel.softwaresystem.deployment.impl.DeploymentPackageImpl;
+import kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation;
import kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionFactory;
import kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage;
-import kieker.analysis.model.analysismodel.softwaresystem.execution.aggregatedInvocation;
+import kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionRoot;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage;
+import kieker.analysis.model.analysismodel.statistics.StatisticsPackage;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl;
+import kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
@@ -35,6 +36,13 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
* @generated
*/
public class ExecutionPackageImpl extends EPackageImpl implements ExecutionPackage {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass executionRootEClass = null;
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -122,7 +130,25 @@ public class ExecutionPackageImpl extends EPackageImpl implements ExecutionPacka
* <!-- end-user-doc -->
* @generated
*/
- public EClass getaggregatedInvocation() {
+ public EClass getExecutionRoot() {
+ return executionRootEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getExecutionRoot_AggregatedInvocations() {
+ return (EReference)executionRootEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getAggregatedInvocation() {
return aggregatedInvocationEClass;
}
@@ -131,7 +157,7 @@ public class ExecutionPackageImpl extends EPackageImpl implements ExecutionPacka
* <!-- end-user-doc -->
* @generated
*/
- public EReference getaggregatedInvocation_Source() {
+ public EReference getAggregatedInvocation_Source() {
return (EReference)aggregatedInvocationEClass.getEStructuralFeatures().get(0);
}
@@ -140,7 +166,7 @@ public class ExecutionPackageImpl extends EPackageImpl implements ExecutionPacka
* <!-- end-user-doc -->
* @generated
*/
- public EReference getaggregatedInvocation_Target() {
+ public EReference getAggregatedInvocation_Target() {
return (EReference)aggregatedInvocationEClass.getEStructuralFeatures().get(1);
}
@@ -172,6 +198,9 @@ public class ExecutionPackageImpl extends EPackageImpl implements ExecutionPacka
isCreated = true;
// Create classes and their features
+ executionRootEClass = createEClass(EXECUTION_ROOT);
+ createEReference(executionRootEClass, EXECUTION_ROOT__AGGREGATED_INVOCATIONS);
+
aggregatedInvocationEClass = createEClass(AGGREGATED_INVOCATION);
createEReference(aggregatedInvocationEClass, AGGREGATED_INVOCATION__SOURCE);
createEReference(aggregatedInvocationEClass, AGGREGATED_INVOCATION__TARGET);
@@ -210,9 +239,12 @@ public class ExecutionPackageImpl extends EPackageImpl implements ExecutionPacka
// Add supertypes to classes
// Initialize classes, features, and operations; add parameters
- 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);
+ initEClass(executionRootEClass, ExecutionRoot.class, "ExecutionRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getExecutionRoot_AggregatedInvocations(), this.getAggregatedInvocation(), null, "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);
}
} //ExecutionPackageImpl
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/ExecutionRootImpl.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/ExecutionRootImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..2f7673de636578935ddc3f543a839047d95ac005
--- /dev/null
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/impl/ExecutionRootImpl.java
@@ -0,0 +1,134 @@
+/**
+ */
+package kieker.analysis.model.analysismodel.softwaresystem.execution.impl;
+
+import java.util.Collection;
+
+import kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation;
+import kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPackage;
+import kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionRoot;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Root</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionRootImpl#getAggregatedInvocations <em>Aggregated Invocations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ExecutionRootImpl extends MinimalEObjectImpl.Container implements ExecutionRoot {
+ /**
+ * The cached value of the '{@link #getAggregatedInvocations() <em>Aggregated Invocations</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getAggregatedInvocations()
+ * @generated
+ * @ordered
+ */
+ protected EList<AggregatedInvocation> aggregatedInvocations;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ExecutionRootImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ExecutionPackage.Literals.EXECUTION_ROOT;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<AggregatedInvocation> getAggregatedInvocations() {
+ if (aggregatedInvocations == null) {
+ aggregatedInvocations = new EObjectResolvingEList<AggregatedInvocation>(AggregatedInvocation.class, this, ExecutionPackage.EXECUTION_ROOT__AGGREGATED_INVOCATIONS);
+ }
+ return aggregatedInvocations;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ExecutionPackage.EXECUTION_ROOT__AGGREGATED_INVOCATIONS:
+ return getAggregatedInvocations();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ExecutionPackage.EXECUTION_ROOT__AGGREGATED_INVOCATIONS:
+ getAggregatedInvocations().clear();
+ getAggregatedInvocations().addAll((Collection<? extends AggregatedInvocation>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ExecutionPackage.EXECUTION_ROOT__AGGREGATED_INVOCATIONS:
+ getAggregatedInvocations().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ExecutionPackage.EXECUTION_ROOT__AGGREGATED_INVOCATIONS:
+ return aggregatedInvocations != null && !aggregatedInvocations.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //ExecutionRootImpl
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/util/ExecutionAdapterFactory.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/util/ExecutionAdapterFactory.java
index 0078367936f3d4b4f370d71ff69159eddb6c3bdd..f7b4b104838585314a30d4e4821eea7348353b67 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/util/ExecutionAdapterFactory.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/util/ExecutionAdapterFactory.java
@@ -68,8 +68,12 @@ public class ExecutionAdapterFactory extends AdapterFactoryImpl {
protected ExecutionSwitch<Adapter> modelSwitch =
new ExecutionSwitch<Adapter>() {
@Override
- public Adapter caseaggregatedInvocation(aggregatedInvocation object) {
- return createaggregatedInvocationAdapter();
+ public Adapter caseExecutionRoot(ExecutionRoot object) {
+ return createExecutionRootAdapter();
+ }
+ @Override
+ public Adapter caseAggregatedInvocation(AggregatedInvocation object) {
+ return createAggregatedInvocationAdapter();
}
@Override
public Adapter defaultCase(EObject object) {
@@ -92,16 +96,30 @@ public class ExecutionAdapterFactory extends AdapterFactoryImpl {
/**
- * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.aggregatedInvocation <em>aggregated Invocation</em>}'.
+ * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionRoot <em>Root</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionRoot
+ * @generated
+ */
+ public Adapter createExecutionRootAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation <em>Aggregated Invocation</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see kieker.analysis.model.analysismodel.softwaresystem.execution.aggregatedInvocation
+ * @see kieker.analysis.model.analysismodel.softwaresystem.execution.AggregatedInvocation
* @generated
*/
- public Adapter createaggregatedInvocationAdapter() {
+ public Adapter createAggregatedInvocationAdapter() {
return null;
}
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/util/ExecutionSwitch.java b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/util/ExecutionSwitch.java
index 53ec5d9947974a2dae431b245d58b7140ab93431..f74727c84cba8712ff819726c6813b01059bc645 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/util/ExecutionSwitch.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/execution/util/ExecutionSwitch.java
@@ -66,9 +66,15 @@ public class ExecutionSwitch<T> extends Switch<T> {
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
switch (classifierID) {
+ case ExecutionPackage.EXECUTION_ROOT: {
+ ExecutionRoot executionRoot = (ExecutionRoot)theEObject;
+ T result = caseExecutionRoot(executionRoot);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
case ExecutionPackage.AGGREGATED_INVOCATION: {
- aggregatedInvocation aggregatedInvocation = (aggregatedInvocation)theEObject;
- T result = caseaggregatedInvocation(aggregatedInvocation);
+ AggregatedInvocation aggregatedInvocation = (AggregatedInvocation)theEObject;
+ T result = caseAggregatedInvocation(aggregatedInvocation);
if (result == null) result = defaultCase(theEObject);
return result;
}
@@ -77,17 +83,32 @@ public class ExecutionSwitch<T> extends Switch<T> {
}
/**
- * Returns the result of interpreting the object as an instance of '<em>aggregated Invocation</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Root</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Root</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseExecutionRoot(ExecutionRoot object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Aggregated Invocation</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>aggregated Invocation</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Aggregated Invocation</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public T caseaggregatedInvocation(aggregatedInvocation object) {
+ public T caseAggregatedInvocation(AggregatedInvocation object) {
return null;
}
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/DoubleValue.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/DoubleValue.java
similarity index 66%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/DoubleValue.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/DoubleValue.java
index 1b66d8b7e3b20cc9d0d1a58d2aec8a24bee71f69..d800a7bcdcd09339915da34b8333a48e7432b1d2 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/DoubleValue.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/DoubleValue.java
@@ -1,6 +1,6 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics;
+package kieker.analysis.model.analysismodel.statistics;
/**
@@ -12,10 +12,10 @@ package kieker.analysis.model.analysismodel.softwaresystem.statistics;
* The following features are supported:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.DoubleValue#getMeasurement <em>Measurement</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.DoubleValue#getMeasurement <em>Measurement</em>}</li>
* </ul>
*
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getDoubleValue()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getDoubleValue()
* @model
* @generated
*/
@@ -30,14 +30,14 @@ public interface DoubleValue extends Value {
* <!-- end-user-doc -->
* @return the value of the '<em>Measurement</em>' attribute.
* @see #setMeasurement(double)
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getDoubleValue_Measurement()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getDoubleValue_Measurement()
* @model
* @generated
*/
double getMeasurement();
/**
- * Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.DoubleValue#getMeasurement <em>Measurement</em>}' attribute.
+ * Sets the value of the '{@link kieker.analysis.model.analysismodel.statistics.DoubleValue#getMeasurement <em>Measurement</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Measurement</em>' attribute.
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/FloatValue.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/FloatValue.java
similarity index 66%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/FloatValue.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/FloatValue.java
index aeb8671c1f6c54544cfd06ce32943a8d5ea16121..3fdf61430dc8b833cbdd185f46ac9f6db5acac77 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/FloatValue.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/FloatValue.java
@@ -1,6 +1,6 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics;
+package kieker.analysis.model.analysismodel.statistics;
/**
@@ -12,10 +12,10 @@ package kieker.analysis.model.analysismodel.softwaresystem.statistics;
* The following features are supported:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.FloatValue#getMeasurement <em>Measurement</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.FloatValue#getMeasurement <em>Measurement</em>}</li>
* </ul>
*
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getFloatValue()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getFloatValue()
* @model
* @generated
*/
@@ -30,14 +30,14 @@ public interface FloatValue extends Value {
* <!-- end-user-doc -->
* @return the value of the '<em>Measurement</em>' attribute.
* @see #setMeasurement(float)
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getFloatValue_Measurement()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getFloatValue_Measurement()
* @model
* @generated
*/
float getMeasurement();
/**
- * Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.FloatValue#getMeasurement <em>Measurement</em>}' attribute.
+ * Sets the value of the '{@link kieker.analysis.model.analysismodel.statistics.FloatValue#getMeasurement <em>Measurement</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Measurement</em>' attribute.
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/IntValue.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/IntValue.java
similarity index 66%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/IntValue.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/IntValue.java
index 1e5dc49d556ffe6e33335cbfaea6611492e59ccf..6fb3441c7a9ba75f048b5c585ede08c0818fda63 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/IntValue.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/IntValue.java
@@ -1,6 +1,6 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics;
+package kieker.analysis.model.analysismodel.statistics;
/**
@@ -12,10 +12,10 @@ package kieker.analysis.model.analysismodel.softwaresystem.statistics;
* The following features are supported:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.IntValue#getMeasurement <em>Measurement</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.IntValue#getMeasurement <em>Measurement</em>}</li>
* </ul>
*
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getIntValue()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getIntValue()
* @model
* @generated
*/
@@ -30,14 +30,14 @@ public interface IntValue extends Value {
* <!-- end-user-doc -->
* @return the value of the '<em>Measurement</em>' attribute.
* @see #setMeasurement(int)
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getIntValue_Measurement()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getIntValue_Measurement()
* @model
* @generated
*/
int getMeasurement();
/**
- * Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.IntValue#getMeasurement <em>Measurement</em>}' attribute.
+ * Sets the value of the '{@link kieker.analysis.model.analysismodel.statistics.IntValue#getMeasurement <em>Measurement</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Measurement</em>' attribute.
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/LongValue.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/LongValue.java
similarity index 66%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/LongValue.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/LongValue.java
index 7df9f9480d189a6b19310702aee611f6307aefbf..8ca3f6f32911fcf18573e36fea9b9f7d9a8ee583 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/LongValue.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/LongValue.java
@@ -1,6 +1,6 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics;
+package kieker.analysis.model.analysismodel.statistics;
/**
@@ -12,10 +12,10 @@ package kieker.analysis.model.analysismodel.softwaresystem.statistics;
* The following features are supported:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.LongValue#getMeasurement <em>Measurement</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.LongValue#getMeasurement <em>Measurement</em>}</li>
* </ul>
*
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getLongValue()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getLongValue()
* @model
* @generated
*/
@@ -30,14 +30,14 @@ public interface LongValue extends Value {
* <!-- end-user-doc -->
* @return the value of the '<em>Measurement</em>' attribute.
* @see #setMeasurement(long)
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getLongValue_Measurement()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getLongValue_Measurement()
* @model
* @generated
*/
long getMeasurement();
/**
- * Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.LongValue#getMeasurement <em>Measurement</em>}' attribute.
+ * Sets the value of the '{@link kieker.analysis.model.analysismodel.statistics.LongValue#getMeasurement <em>Measurement</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Measurement</em>' attribute.
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/PredefinedUnits.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/PredefinedUnits.java
similarity index 96%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/PredefinedUnits.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/PredefinedUnits.java
index 1c73f824a50eafbd0013199000ed9bb7c702c850..e050a64c02fdc3e6e5dd84ce6aa63372d7068847 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/PredefinedUnits.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/PredefinedUnits.java
@@ -1,6 +1,6 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics;
+package kieker.analysis.model.analysismodel.statistics;
import java.util.Arrays;
import java.util.Collections;
@@ -13,7 +13,7 @@ import org.eclipse.emf.common.util.Enumerator;
* A representation of the literals of the enumeration '<em><b>Predefined Units</b></em>',
* and utility methods for working with them.
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getPredefinedUnits()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getPredefinedUnits()
* @model
* @generated
*/
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/Statistics.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/Statistics.java
similarity index 64%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/Statistics.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/Statistics.java
index 661f7d1de71788e3dba61a098badef5770afc7c5..233725b1bba03ece0f442ad7844ed6497c440272 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/Statistics.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/Statistics.java
@@ -1,6 +1,6 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics;
+package kieker.analysis.model.analysismodel.statistics;
import org.eclipse.emf.common.util.EList;
@@ -15,17 +15,17 @@ import org.eclipse.emf.ecore.EObject;
* The following features are supported:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.Statistics#getTimeSeries <em>Time Series</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.Statistics#getTimeSeries <em>Time Series</em>}</li>
* </ul>
*
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getStatistics()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getStatistics()
* @model
* @generated
*/
public interface Statistics extends EObject {
/**
* Returns the value of the '<em><b>Time Series</b></em>' reference list.
- * The list contents are of type {@link kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries}<?, ?>.
+ * The list contents are of type {@link kieker.analysis.model.analysismodel.statistics.TimeSeries}<?, ?>.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Time Series</em>' reference list isn't clear,
@@ -33,7 +33,7 @@ public interface Statistics extends EObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Time Series</em>' reference list.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getStatistics_TimeSeries()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getStatistics_TimeSeries()
* @model
* @generated
*/
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/StatisticsFactory.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/StatisticsFactory.java
similarity index 90%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/StatisticsFactory.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/StatisticsFactory.java
index a4d442afd8e2d3fa6e74cfa5bea5aa5bf01ba557..ff60f72cbe03c8982331e334deda14d8c2b3232c 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/StatisticsFactory.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/StatisticsFactory.java
@@ -1,6 +1,6 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics;
+package kieker.analysis.model.analysismodel.statistics;
import org.eclipse.emf.ecore.EFactory;
@@ -9,7 +9,7 @@ import org.eclipse.emf.ecore.EFactory;
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage
* @generated
*/
public interface StatisticsFactory extends EFactory {
@@ -19,7 +19,7 @@ public interface StatisticsFactory extends EFactory {
* <!-- end-user-doc -->
* @generated
*/
- StatisticsFactory eINSTANCE = kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsFactoryImpl.init();
+ StatisticsFactory eINSTANCE = kieker.analysis.model.analysismodel.statistics.impl.StatisticsFactoryImpl.init();
/**
* Returns a new object of class '<em>Statistics</em>'.
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/StatisticsPackage.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/StatisticsPackage.java
similarity index 67%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/StatisticsPackage.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/StatisticsPackage.java
index e60f75f754b1358c7f9e120e29189cc395db15c2..f7d7c36d77d642b7af8c9a7a3b5aca35b8fe136d 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/StatisticsPackage.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/StatisticsPackage.java
@@ -1,6 +1,6 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics;
+package kieker.analysis.model.analysismodel.statistics;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsFactory
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsFactory
* @model kind="package"
* @generated
*/
@@ -55,14 +55,14 @@ public interface StatisticsPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- StatisticsPackage eINSTANCE = kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl.init();
+ StatisticsPackage eINSTANCE = kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl.init();
/**
- * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsImpl <em>Statistics</em>}' class.
+ * The meta object id for the '{@link kieker.analysis.model.analysismodel.statistics.impl.StatisticsImpl <em>Statistics</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getStatistics()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getStatistics()
* @generated
*/
int STATISTICS = 0;
@@ -95,11 +95,11 @@ public interface StatisticsPackage extends EPackage {
int STATISTICS_OPERATION_COUNT = 0;
/**
- * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.TimeSeriesImpl <em>Time Series</em>}' class.
+ * The meta object id for the '{@link kieker.analysis.model.analysismodel.statistics.impl.TimeSeriesImpl <em>Time Series</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.TimeSeriesImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getTimeSeries()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.TimeSeriesImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getTimeSeries()
* @generated
*/
int TIME_SERIES = 1;
@@ -150,11 +150,11 @@ public interface StatisticsPackage extends EPackage {
int TIME_SERIES_OPERATION_COUNT = 0;
/**
- * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.ValueImpl <em>Value</em>}' class.
+ * The meta object id for the '{@link kieker.analysis.model.analysismodel.statistics.impl.ValueImpl <em>Value</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.ValueImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getValue()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.ValueImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getValue()
* @generated
*/
int VALUE = 2;
@@ -187,11 +187,11 @@ public interface StatisticsPackage extends EPackage {
int VALUE_OPERATION_COUNT = 0;
/**
- * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.IntValueImpl <em>Int Value</em>}' class.
+ * The meta object id for the '{@link kieker.analysis.model.analysismodel.statistics.impl.IntValueImpl <em>Int Value</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.IntValueImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getIntValue()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.IntValueImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getIntValue()
* @generated
*/
int INT_VALUE = 3;
@@ -233,11 +233,11 @@ public interface StatisticsPackage extends EPackage {
int INT_VALUE_OPERATION_COUNT = VALUE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.LongValueImpl <em>Long Value</em>}' class.
+ * The meta object id for the '{@link kieker.analysis.model.analysismodel.statistics.impl.LongValueImpl <em>Long Value</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.LongValueImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getLongValue()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.LongValueImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getLongValue()
* @generated
*/
int LONG_VALUE = 4;
@@ -279,11 +279,11 @@ public interface StatisticsPackage extends EPackage {
int LONG_VALUE_OPERATION_COUNT = VALUE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.FloatValueImpl <em>Float Value</em>}' class.
+ * The meta object id for the '{@link kieker.analysis.model.analysismodel.statistics.impl.FloatValueImpl <em>Float Value</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.FloatValueImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getFloatValue()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.FloatValueImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getFloatValue()
* @generated
*/
int FLOAT_VALUE = 5;
@@ -325,11 +325,11 @@ public interface StatisticsPackage extends EPackage {
int FLOAT_VALUE_OPERATION_COUNT = VALUE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.DoubleValueImpl <em>Double Value</em>}' class.
+ * The meta object id for the '{@link kieker.analysis.model.analysismodel.statistics.impl.DoubleValueImpl <em>Double Value</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.DoubleValueImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getDoubleValue()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.DoubleValueImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getDoubleValue()
* @generated
*/
int DOUBLE_VALUE = 6;
@@ -371,11 +371,11 @@ public interface StatisticsPackage extends EPackage {
int DOUBLE_VALUE_OPERATION_COUNT = VALUE_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.Unit <em>Unit</em>}' class.
+ * The meta object id for the '{@link kieker.analysis.model.analysismodel.statistics.Unit <em>Unit</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.Unit
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getUnit()
+ * @see kieker.analysis.model.analysismodel.statistics.Unit
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getUnit()
* @generated
*/
int UNIT = 7;
@@ -399,201 +399,201 @@ public interface StatisticsPackage extends EPackage {
int UNIT_OPERATION_COUNT = 0;
/**
- * The meta object id for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.PredefinedUnits <em>Predefined Units</em>}' enum.
+ * The meta object id for the '{@link kieker.analysis.model.analysismodel.statistics.PredefinedUnits <em>Predefined Units</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.PredefinedUnits
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getPredefinedUnits()
+ * @see kieker.analysis.model.analysismodel.statistics.PredefinedUnits
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getPredefinedUnits()
* @generated
*/
int PREDEFINED_UNITS = 8;
/**
- * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.Statistics <em>Statistics</em>}'.
+ * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.statistics.Statistics <em>Statistics</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Statistics</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.Statistics
+ * @see kieker.analysis.model.analysismodel.statistics.Statistics
* @generated
*/
EClass getStatistics();
/**
- * Returns the meta object for the reference list '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.Statistics#getTimeSeries <em>Time Series</em>}'.
+ * Returns the meta object for the reference list '{@link kieker.analysis.model.analysismodel.statistics.Statistics#getTimeSeries <em>Time Series</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference list '<em>Time Series</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.Statistics#getTimeSeries()
+ * @see kieker.analysis.model.analysismodel.statistics.Statistics#getTimeSeries()
* @see #getStatistics()
* @generated
*/
EReference getStatistics_TimeSeries();
/**
- * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries <em>Time Series</em>}'.
+ * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.statistics.TimeSeries <em>Time Series</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Time Series</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries
+ * @see kieker.analysis.model.analysismodel.statistics.TimeSeries
* @generated
*/
EClass getTimeSeries();
/**
- * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.statistics.TimeSeries#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Name</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries#getName()
+ * @see kieker.analysis.model.analysismodel.statistics.TimeSeries#getName()
* @see #getTimeSeries()
* @generated
*/
EAttribute getTimeSeries_Name();
/**
- * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries#getUnit <em>Unit</em>}'.
+ * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.statistics.TimeSeries#getUnit <em>Unit</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Unit</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries#getUnit()
+ * @see kieker.analysis.model.analysismodel.statistics.TimeSeries#getUnit()
* @see #getTimeSeries()
* @generated
*/
EAttribute getTimeSeries_Unit();
/**
- * Returns the meta object for the reference list '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries#getValues <em>Values</em>}'.
+ * Returns the meta object for the reference list '{@link kieker.analysis.model.analysismodel.statistics.TimeSeries#getValues <em>Values</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference list '<em>Values</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries#getValues()
+ * @see kieker.analysis.model.analysismodel.statistics.TimeSeries#getValues()
* @see #getTimeSeries()
* @generated
*/
EReference getTimeSeries_Values();
/**
- * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.Value <em>Value</em>}'.
+ * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.statistics.Value <em>Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Value</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.Value
+ * @see kieker.analysis.model.analysismodel.statistics.Value
* @generated
*/
EClass getValue();
/**
- * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.Value#getTimestamp <em>Timestamp</em>}'.
+ * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.statistics.Value#getTimestamp <em>Timestamp</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Timestamp</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.Value#getTimestamp()
+ * @see kieker.analysis.model.analysismodel.statistics.Value#getTimestamp()
* @see #getValue()
* @generated
*/
EAttribute getValue_Timestamp();
/**
- * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.IntValue <em>Int Value</em>}'.
+ * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.statistics.IntValue <em>Int Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Int Value</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.IntValue
+ * @see kieker.analysis.model.analysismodel.statistics.IntValue
* @generated
*/
EClass getIntValue();
/**
- * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.IntValue#getMeasurement <em>Measurement</em>}'.
+ * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.statistics.IntValue#getMeasurement <em>Measurement</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Measurement</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.IntValue#getMeasurement()
+ * @see kieker.analysis.model.analysismodel.statistics.IntValue#getMeasurement()
* @see #getIntValue()
* @generated
*/
EAttribute getIntValue_Measurement();
/**
- * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.LongValue <em>Long Value</em>}'.
+ * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.statistics.LongValue <em>Long Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Long Value</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.LongValue
+ * @see kieker.analysis.model.analysismodel.statistics.LongValue
* @generated
*/
EClass getLongValue();
/**
- * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.LongValue#getMeasurement <em>Measurement</em>}'.
+ * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.statistics.LongValue#getMeasurement <em>Measurement</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Measurement</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.LongValue#getMeasurement()
+ * @see kieker.analysis.model.analysismodel.statistics.LongValue#getMeasurement()
* @see #getLongValue()
* @generated
*/
EAttribute getLongValue_Measurement();
/**
- * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.FloatValue <em>Float Value</em>}'.
+ * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.statistics.FloatValue <em>Float Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Float Value</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.FloatValue
+ * @see kieker.analysis.model.analysismodel.statistics.FloatValue
* @generated
*/
EClass getFloatValue();
/**
- * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.FloatValue#getMeasurement <em>Measurement</em>}'.
+ * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.statistics.FloatValue#getMeasurement <em>Measurement</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Measurement</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.FloatValue#getMeasurement()
+ * @see kieker.analysis.model.analysismodel.statistics.FloatValue#getMeasurement()
* @see #getFloatValue()
* @generated
*/
EAttribute getFloatValue_Measurement();
/**
- * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.DoubleValue <em>Double Value</em>}'.
+ * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.statistics.DoubleValue <em>Double Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Double Value</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.DoubleValue
+ * @see kieker.analysis.model.analysismodel.statistics.DoubleValue
* @generated
*/
EClass getDoubleValue();
/**
- * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.DoubleValue#getMeasurement <em>Measurement</em>}'.
+ * Returns the meta object for the attribute '{@link kieker.analysis.model.analysismodel.statistics.DoubleValue#getMeasurement <em>Measurement</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Measurement</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.DoubleValue#getMeasurement()
+ * @see kieker.analysis.model.analysismodel.statistics.DoubleValue#getMeasurement()
* @see #getDoubleValue()
* @generated
*/
EAttribute getDoubleValue_Measurement();
/**
- * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.Unit <em>Unit</em>}'.
+ * Returns the meta object for class '{@link kieker.analysis.model.analysismodel.statistics.Unit <em>Unit</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Unit</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.Unit
+ * @see kieker.analysis.model.analysismodel.statistics.Unit
* @generated
*/
EClass getUnit();
/**
- * Returns the meta object for enum '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.PredefinedUnits <em>Predefined Units</em>}'.
+ * Returns the meta object for enum '{@link kieker.analysis.model.analysismodel.statistics.PredefinedUnits <em>Predefined Units</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for enum '<em>Predefined Units</em>'.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.PredefinedUnits
+ * @see kieker.analysis.model.analysismodel.statistics.PredefinedUnits
* @generated
*/
EEnum getPredefinedUnits();
@@ -622,11 +622,11 @@ public interface StatisticsPackage extends EPackage {
*/
interface Literals {
/**
- * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsImpl <em>Statistics</em>}' class.
+ * The meta object literal for the '{@link kieker.analysis.model.analysismodel.statistics.impl.StatisticsImpl <em>Statistics</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getStatistics()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getStatistics()
* @generated
*/
EClass STATISTICS = eINSTANCE.getStatistics();
@@ -640,11 +640,11 @@ public interface StatisticsPackage extends EPackage {
EReference STATISTICS__TIME_SERIES = eINSTANCE.getStatistics_TimeSeries();
/**
- * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.TimeSeriesImpl <em>Time Series</em>}' class.
+ * The meta object literal for the '{@link kieker.analysis.model.analysismodel.statistics.impl.TimeSeriesImpl <em>Time Series</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.TimeSeriesImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getTimeSeries()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.TimeSeriesImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getTimeSeries()
* @generated
*/
EClass TIME_SERIES = eINSTANCE.getTimeSeries();
@@ -674,11 +674,11 @@ public interface StatisticsPackage extends EPackage {
EReference TIME_SERIES__VALUES = eINSTANCE.getTimeSeries_Values();
/**
- * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.ValueImpl <em>Value</em>}' class.
+ * The meta object literal for the '{@link kieker.analysis.model.analysismodel.statistics.impl.ValueImpl <em>Value</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.ValueImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getValue()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.ValueImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getValue()
* @generated
*/
EClass VALUE = eINSTANCE.getValue();
@@ -692,11 +692,11 @@ public interface StatisticsPackage extends EPackage {
EAttribute VALUE__TIMESTAMP = eINSTANCE.getValue_Timestamp();
/**
- * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.IntValueImpl <em>Int Value</em>}' class.
+ * The meta object literal for the '{@link kieker.analysis.model.analysismodel.statistics.impl.IntValueImpl <em>Int Value</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.IntValueImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getIntValue()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.IntValueImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getIntValue()
* @generated
*/
EClass INT_VALUE = eINSTANCE.getIntValue();
@@ -710,11 +710,11 @@ public interface StatisticsPackage extends EPackage {
EAttribute INT_VALUE__MEASUREMENT = eINSTANCE.getIntValue_Measurement();
/**
- * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.LongValueImpl <em>Long Value</em>}' class.
+ * The meta object literal for the '{@link kieker.analysis.model.analysismodel.statistics.impl.LongValueImpl <em>Long Value</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.LongValueImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getLongValue()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.LongValueImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getLongValue()
* @generated
*/
EClass LONG_VALUE = eINSTANCE.getLongValue();
@@ -728,11 +728,11 @@ public interface StatisticsPackage extends EPackage {
EAttribute LONG_VALUE__MEASUREMENT = eINSTANCE.getLongValue_Measurement();
/**
- * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.FloatValueImpl <em>Float Value</em>}' class.
+ * The meta object literal for the '{@link kieker.analysis.model.analysismodel.statistics.impl.FloatValueImpl <em>Float Value</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.FloatValueImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getFloatValue()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.FloatValueImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getFloatValue()
* @generated
*/
EClass FLOAT_VALUE = eINSTANCE.getFloatValue();
@@ -746,11 +746,11 @@ public interface StatisticsPackage extends EPackage {
EAttribute FLOAT_VALUE__MEASUREMENT = eINSTANCE.getFloatValue_Measurement();
/**
- * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.DoubleValueImpl <em>Double Value</em>}' class.
+ * The meta object literal for the '{@link kieker.analysis.model.analysismodel.statistics.impl.DoubleValueImpl <em>Double Value</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.DoubleValueImpl
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getDoubleValue()
+ * @see kieker.analysis.model.analysismodel.statistics.impl.DoubleValueImpl
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getDoubleValue()
* @generated
*/
EClass DOUBLE_VALUE = eINSTANCE.getDoubleValue();
@@ -764,21 +764,21 @@ public interface StatisticsPackage extends EPackage {
EAttribute DOUBLE_VALUE__MEASUREMENT = eINSTANCE.getDoubleValue_Measurement();
/**
- * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.Unit <em>Unit</em>}' class.
+ * The meta object literal for the '{@link kieker.analysis.model.analysismodel.statistics.Unit <em>Unit</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.Unit
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getUnit()
+ * @see kieker.analysis.model.analysismodel.statistics.Unit
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getUnit()
* @generated
*/
EClass UNIT = eINSTANCE.getUnit();
/**
- * The meta object literal for the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.PredefinedUnits <em>Predefined Units</em>}' enum.
+ * The meta object literal for the '{@link kieker.analysis.model.analysismodel.statistics.PredefinedUnits <em>Predefined Units</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.PredefinedUnits
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsPackageImpl#getPredefinedUnits()
+ * @see kieker.analysis.model.analysismodel.statistics.PredefinedUnits
+ * @see kieker.analysis.model.analysismodel.statistics.impl.StatisticsPackageImpl#getPredefinedUnits()
* @generated
*/
EEnum PREDEFINED_UNITS = eINSTANCE.getPredefinedUnits();
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/TimeSeries.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/TimeSeries.java
similarity index 66%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/TimeSeries.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/TimeSeries.java
index 326f8f9e8f9759531df22881c9a5832fb1b52523..d3fe8a58772717d96b81be0bf48c251136b77b0b 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/TimeSeries.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/TimeSeries.java
@@ -1,6 +1,6 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics;
+package kieker.analysis.model.analysismodel.statistics;
import org.eclipse.emf.common.util.EList;
@@ -15,12 +15,12 @@ import org.eclipse.emf.ecore.EObject;
* The following features are supported:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries#getName <em>Name</em>}</li>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries#getUnit <em>Unit</em>}</li>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries#getValues <em>Values</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.TimeSeries#getName <em>Name</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.TimeSeries#getUnit <em>Unit</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.TimeSeries#getValues <em>Values</em>}</li>
* </ul>
*
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getTimeSeries()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getTimeSeries()
* @model
* @generated
*/
@@ -34,7 +34,7 @@ public interface TimeSeries<V extends Value, U extends Unit<V>> extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getTimeSeries_Name()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getTimeSeries_Name()
* @model id="true" changeable="false"
* @generated
*/
@@ -50,14 +50,14 @@ public interface TimeSeries<V extends Value, U extends Unit<V>> extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Unit</em>' attribute.
* @see #setUnit(Object)
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getTimeSeries_Unit()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getTimeSeries_Unit()
* @model
* @generated
*/
Object getUnit();
/**
- * Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries#getUnit <em>Unit</em>}' attribute.
+ * Sets the value of the '{@link kieker.analysis.model.analysismodel.statistics.TimeSeries#getUnit <em>Unit</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Unit</em>' attribute.
@@ -75,7 +75,7 @@ public interface TimeSeries<V extends Value, U extends Unit<V>> extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Values</em>' reference list.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getTimeSeries_Values()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getTimeSeries_Values()
* @model
* @generated
*/
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/Unit.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/Unit.java
similarity index 64%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/Unit.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/Unit.java
index 9463085cd5cbfc61f43a28706b5d425b4b462a03..cd7ffe059169768afccec359cc6826faa75e84d0 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/Unit.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/Unit.java
@@ -1,6 +1,6 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics;
+package kieker.analysis.model.analysismodel.statistics;
import org.eclipse.emf.ecore.EObject;
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
* <!-- end-user-doc -->
*
*
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getUnit()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getUnit()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/Value.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/Value.java
similarity index 69%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/Value.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/Value.java
index 9e679bd24dc783b7141f06c1557181a6e2629409..9bc2ac0045cd146bb0ef89c5a214a33d9441ef17 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/Value.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/Value.java
@@ -1,6 +1,6 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics;
+package kieker.analysis.model.analysismodel.statistics;
import java.time.Instant;
@@ -15,10 +15,10 @@ import org.eclipse.emf.ecore.EObject;
* The following features are supported:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.Value#getTimestamp <em>Timestamp</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.Value#getTimestamp <em>Timestamp</em>}</li>
* </ul>
*
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getValue()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getValue()
* @model abstract="true"
* @generated
*/
@@ -33,14 +33,14 @@ public interface Value extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Timestamp</em>' attribute.
* @see #setTimestamp(Instant)
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#getValue_Timestamp()
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#getValue_Timestamp()
* @model dataType="kieker.analysis.model.analysismodel.Instant"
* @generated
*/
Instant getTimestamp();
/**
- * Sets the value of the '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.Value#getTimestamp <em>Timestamp</em>}' attribute.
+ * Sets the value of the '{@link kieker.analysis.model.analysismodel.statistics.Value#getTimestamp <em>Timestamp</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Timestamp</em>' attribute.
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/DoubleValueImpl.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/DoubleValueImpl.java
similarity index 89%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/DoubleValueImpl.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/impl/DoubleValueImpl.java
index 81b65f22572f3d60a975921c1546db3c1f765a3c..83a44de9fe65a98cf5ac1ccc4ca1f1fe9d2de701 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/DoubleValueImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/DoubleValueImpl.java
@@ -1,9 +1,9 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics.impl;
+package kieker.analysis.model.analysismodel.statistics.impl;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.DoubleValue;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage;
+import kieker.analysis.model.analysismodel.statistics.DoubleValue;
+import kieker.analysis.model.analysismodel.statistics.StatisticsPackage;
import org.eclipse.emf.common.notify.Notification;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.DoubleValueImpl#getMeasurement <em>Measurement</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.impl.DoubleValueImpl#getMeasurement <em>Measurement</em>}</li>
* </ul>
*
* @generated
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/FloatValueImpl.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/FloatValueImpl.java
similarity index 89%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/FloatValueImpl.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/impl/FloatValueImpl.java
index 9845d77796b1f949a6757e983bd7081993a70b4d..541460ded32b53fd12b0135efde34d023e6e0b71 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/FloatValueImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/FloatValueImpl.java
@@ -1,9 +1,9 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics.impl;
+package kieker.analysis.model.analysismodel.statistics.impl;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.FloatValue;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage;
+import kieker.analysis.model.analysismodel.statistics.FloatValue;
+import kieker.analysis.model.analysismodel.statistics.StatisticsPackage;
import org.eclipse.emf.common.notify.Notification;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.FloatValueImpl#getMeasurement <em>Measurement</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.impl.FloatValueImpl#getMeasurement <em>Measurement</em>}</li>
* </ul>
*
* @generated
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/IntValueImpl.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/IntValueImpl.java
similarity index 89%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/IntValueImpl.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/impl/IntValueImpl.java
index 248a85ea42c28782a1f750ac820076070677cc4a..9d0c60bef67a7fb793a84328aeafebd00e3ede59 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/IntValueImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/IntValueImpl.java
@@ -1,9 +1,9 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics.impl;
+package kieker.analysis.model.analysismodel.statistics.impl;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.IntValue;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage;
+import kieker.analysis.model.analysismodel.statistics.IntValue;
+import kieker.analysis.model.analysismodel.statistics.StatisticsPackage;
import org.eclipse.emf.common.notify.Notification;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.IntValueImpl#getMeasurement <em>Measurement</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.impl.IntValueImpl#getMeasurement <em>Measurement</em>}</li>
* </ul>
*
* @generated
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/LongValueImpl.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/LongValueImpl.java
similarity index 89%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/LongValueImpl.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/impl/LongValueImpl.java
index 4f28ebb4213065c59d166442064941c5d9ff4047..5f53b5cbae5246da7a2ac5c8eda8937bbb2c7174 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/LongValueImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/LongValueImpl.java
@@ -1,9 +1,9 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics.impl;
+package kieker.analysis.model.analysismodel.statistics.impl;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.LongValue;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage;
+import kieker.analysis.model.analysismodel.statistics.LongValue;
+import kieker.analysis.model.analysismodel.statistics.StatisticsPackage;
import org.eclipse.emf.common.notify.Notification;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.LongValueImpl#getMeasurement <em>Measurement</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.impl.LongValueImpl#getMeasurement <em>Measurement</em>}</li>
* </ul>
*
* @generated
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/StatisticsFactoryImpl.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/StatisticsFactoryImpl.java
similarity index 97%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/StatisticsFactoryImpl.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/impl/StatisticsFactoryImpl.java
index 3c059e46a79c1cdd42193238ce0a386c8a6626cb..f73703acf7184edb36fd404e9628b2022e42d2a9 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/StatisticsFactoryImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/StatisticsFactoryImpl.java
@@ -1,8 +1,8 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics.impl;
+package kieker.analysis.model.analysismodel.statistics.impl;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.*;
+import kieker.analysis.model.analysismodel.statistics.*;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/StatisticsImpl.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/StatisticsImpl.java
similarity index 85%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/StatisticsImpl.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/impl/StatisticsImpl.java
index 465ecc0e5a4e4f7c8be7a3f484e4a46cfb1dbdfb..c673e5ec71849eecd5003c4ceb28a05bc9a01f21 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/StatisticsImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/StatisticsImpl.java
@@ -1,12 +1,12 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics.impl;
+package kieker.analysis.model.analysismodel.statistics.impl;
import java.util.Collection;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.Statistics;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries;
+import kieker.analysis.model.analysismodel.statistics.Statistics;
+import kieker.analysis.model.analysismodel.statistics.StatisticsPackage;
+import kieker.analysis.model.analysismodel.statistics.TimeSeries;
import org.eclipse.emf.common.util.EList;
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.StatisticsImpl#getTimeSeries <em>Time Series</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.impl.StatisticsImpl#getTimeSeries <em>Time Series</em>}</li>
* </ul>
*
* @generated
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/StatisticsPackageImpl.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/StatisticsPackageImpl.java
similarity index 93%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/StatisticsPackageImpl.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/impl/StatisticsPackageImpl.java
index 860e1b05b08d147b55309403896b584371dc0c2b..1d91c67b3534688a7162e9edb657328d7e86a86e 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/StatisticsPackageImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/StatisticsPackageImpl.java
@@ -1,6 +1,6 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics.impl;
+package kieker.analysis.model.analysismodel.statistics.impl;
import kieker.analysis.model.analysismodel.analysismodelPackage;
@@ -18,17 +18,17 @@ import kieker.analysis.model.analysismodel.softwaresystem.execution.ExecutionPac
import kieker.analysis.model.analysismodel.softwaresystem.execution.impl.ExecutionPackageImpl;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.DoubleValue;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.FloatValue;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.IntValue;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.LongValue;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.PredefinedUnits;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.Statistics;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsFactory;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.Unit;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.Value;
+import kieker.analysis.model.analysismodel.statistics.DoubleValue;
+import kieker.analysis.model.analysismodel.statistics.FloatValue;
+import kieker.analysis.model.analysismodel.statistics.IntValue;
+import kieker.analysis.model.analysismodel.statistics.LongValue;
+import kieker.analysis.model.analysismodel.statistics.PredefinedUnits;
+import kieker.analysis.model.analysismodel.statistics.Statistics;
+import kieker.analysis.model.analysismodel.statistics.StatisticsFactory;
+import kieker.analysis.model.analysismodel.statistics.StatisticsPackage;
+import kieker.analysis.model.analysismodel.statistics.TimeSeries;
+import kieker.analysis.model.analysismodel.statistics.Unit;
+import kieker.analysis.model.analysismodel.statistics.Value;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -121,7 +121,7 @@ public class StatisticsPackageImpl extends EPackageImpl implements StatisticsPac
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage#eNS_URI
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage#eNS_URI
* @see #init()
* @generated
*/
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/TimeSeriesImpl.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/TimeSeriesImpl.java
similarity index 86%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/TimeSeriesImpl.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/impl/TimeSeriesImpl.java
index 1a3f41f9c169ab37ebb0a011a4f6a2de655b634e..033c845333e8aeaae8bce209416f3fceb80cfffb 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/TimeSeriesImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/TimeSeriesImpl.java
@@ -1,13 +1,13 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics.impl;
+package kieker.analysis.model.analysismodel.statistics.impl;
import java.util.Collection;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.Unit;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.Value;
+import kieker.analysis.model.analysismodel.statistics.StatisticsPackage;
+import kieker.analysis.model.analysismodel.statistics.TimeSeries;
+import kieker.analysis.model.analysismodel.statistics.Unit;
+import kieker.analysis.model.analysismodel.statistics.Value;
import org.eclipse.emf.common.notify.Notification;
@@ -28,9 +28,9 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.TimeSeriesImpl#getName <em>Name</em>}</li>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.TimeSeriesImpl#getUnit <em>Unit</em>}</li>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.TimeSeriesImpl#getValues <em>Values</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.impl.TimeSeriesImpl#getName <em>Name</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.impl.TimeSeriesImpl#getUnit <em>Unit</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.impl.TimeSeriesImpl#getValues <em>Values</em>}</li>
* </ul>
*
* @generated
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/ValueImpl.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/ValueImpl.java
similarity index 90%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/ValueImpl.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/impl/ValueImpl.java
index 2242317d77fa1474a9fad666b2ebcf8fce7b7218..753f5c283a486961ff3907ae1f1c84a2c6d14092 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/impl/ValueImpl.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/impl/ValueImpl.java
@@ -1,11 +1,11 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics.impl;
+package kieker.analysis.model.analysismodel.statistics.impl;
import java.time.Instant;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.Value;
+import kieker.analysis.model.analysismodel.statistics.StatisticsPackage;
+import kieker.analysis.model.analysismodel.statistics.Value;
import org.eclipse.emf.common.notify.Notification;
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.impl.ValueImpl#getTimestamp <em>Timestamp</em>}</li>
+ * <li>{@link kieker.analysis.model.analysismodel.statistics.impl.ValueImpl#getTimestamp <em>Timestamp</em>}</li>
* </ul>
*
* @generated
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/util/StatisticsAdapterFactory.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/util/StatisticsAdapterFactory.java
similarity index 80%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/util/StatisticsAdapterFactory.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/util/StatisticsAdapterFactory.java
index 90d8f535dda5b4e772a7bf328062ce843f3a78d0..0e601960908fd371056320618478f4e123430abd 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/util/StatisticsAdapterFactory.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/util/StatisticsAdapterFactory.java
@@ -1,8 +1,8 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics.util;
+package kieker.analysis.model.analysismodel.statistics.util;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.*;
+import kieker.analysis.model.analysismodel.statistics.*;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject;
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage
* @generated
*/
public class StatisticsAdapterFactory extends AdapterFactoryImpl {
@@ -120,13 +120,13 @@ public class StatisticsAdapterFactory extends AdapterFactoryImpl {
/**
- * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.Statistics <em>Statistics</em>}'.
+ * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.statistics.Statistics <em>Statistics</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.Statistics
+ * @see kieker.analysis.model.analysismodel.statistics.Statistics
* @generated
*/
public Adapter createStatisticsAdapter() {
@@ -134,13 +134,13 @@ public class StatisticsAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries <em>Time Series</em>}'.
+ * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.statistics.TimeSeries <em>Time Series</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.TimeSeries
+ * @see kieker.analysis.model.analysismodel.statistics.TimeSeries
* @generated
*/
public Adapter createTimeSeriesAdapter() {
@@ -148,13 +148,13 @@ public class StatisticsAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.Value <em>Value</em>}'.
+ * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.statistics.Value <em>Value</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.Value
+ * @see kieker.analysis.model.analysismodel.statistics.Value
* @generated
*/
public Adapter createValueAdapter() {
@@ -162,13 +162,13 @@ public class StatisticsAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.IntValue <em>Int Value</em>}'.
+ * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.statistics.IntValue <em>Int Value</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.IntValue
+ * @see kieker.analysis.model.analysismodel.statistics.IntValue
* @generated
*/
public Adapter createIntValueAdapter() {
@@ -176,13 +176,13 @@ public class StatisticsAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.LongValue <em>Long Value</em>}'.
+ * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.statistics.LongValue <em>Long Value</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.LongValue
+ * @see kieker.analysis.model.analysismodel.statistics.LongValue
* @generated
*/
public Adapter createLongValueAdapter() {
@@ -190,13 +190,13 @@ public class StatisticsAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.FloatValue <em>Float Value</em>}'.
+ * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.statistics.FloatValue <em>Float Value</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.FloatValue
+ * @see kieker.analysis.model.analysismodel.statistics.FloatValue
* @generated
*/
public Adapter createFloatValueAdapter() {
@@ -204,13 +204,13 @@ public class StatisticsAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.DoubleValue <em>Double Value</em>}'.
+ * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.statistics.DoubleValue <em>Double Value</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.DoubleValue
+ * @see kieker.analysis.model.analysismodel.statistics.DoubleValue
* @generated
*/
public Adapter createDoubleValueAdapter() {
@@ -218,13 +218,13 @@ public class StatisticsAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.softwaresystem.statistics.Unit <em>Unit</em>}'.
+ * Creates a new adapter for an object of class '{@link kieker.analysis.model.analysismodel.statistics.Unit <em>Unit</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.Unit
+ * @see kieker.analysis.model.analysismodel.statistics.Unit
* @generated
*/
public Adapter createUnitAdapter() {
diff --git a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/util/StatisticsSwitch.java b/src/main/java/kieker/analysis/model/analysismodel/statistics/util/StatisticsSwitch.java
similarity index 97%
rename from src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/util/StatisticsSwitch.java
rename to src/main/java/kieker/analysis/model/analysismodel/statistics/util/StatisticsSwitch.java
index 8547ec49337030d8aa0e1b2170d89b43bbafffca..0e85d3855fe9f9c735785518f998bf516f6c6b56 100644
--- a/src/main/java/kieker/analysis/model/analysismodel/softwaresystem/statistics/util/StatisticsSwitch.java
+++ b/src/main/java/kieker/analysis/model/analysismodel/statistics/util/StatisticsSwitch.java
@@ -1,8 +1,8 @@
/**
*/
-package kieker.analysis.model.analysismodel.softwaresystem.statistics.util;
+package kieker.analysis.model.analysismodel.statistics.util;
-import kieker.analysis.model.analysismodel.softwaresystem.statistics.*;
+import kieker.analysis.model.analysismodel.statistics.*;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.util.Switch;
* until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see kieker.analysis.model.analysismodel.softwaresystem.statistics.StatisticsPackage
+ * @see kieker.analysis.model.analysismodel.statistics.StatisticsPackage
* @generated
*/
public class StatisticsSwitch<T> extends Switch<T> {