.

WFRperfTool/.classpath

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="libs/sqlite-jdbc-3.7.2.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

WFRperfTool/.project

@@ -22,6 +22,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.sirius.nature.modelingproject</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>

WFRperfTool/.settings/org.eclipse.core.resources.prefs

@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//dbmodel/WFRperfToolModel.ecore=UTF-8
-encoding//dbmodel/WFRperfToolModel.ecorediag=UTF-8

WFRperfTool/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8

WFRperfTool/META-INF/MANIFEST.MF

@@ -1,12 +1,17 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: WFRperfTool
 Bundle-SymbolicName: WFRperfTool;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .,
  libs/sqlite-jdbc-3.7.2.jar
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
+Export-Package: at.ac.uibk.wfr.perftool,
+ at.ac.uibk.wfr.perftool.impl,
+ at.ac.uibk.wfr.perftool.util,
+ at.ac.uibk.wfr.perftool.validation,
+ perftoolutils
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.teneo;bundle-version="2.0.1",
@@ -14,8 +19,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.hibernate;bundle-version="4.1.1",
  org.apache.commons.logging;bundle-version="1.1.1",
  javax.persistence;bundle-version="2.0.1"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: at.ac.uibk.wfr.perftool,
- at.ac.uibk.wfr.perftool.impl,
- at.ac.uibk.wfr.perftool.util

WFRperfTool/bin/.gitignore

@@ -0,0 +1 @@
+/at/

WFRperfTool/bin/perftoolutils/teneo.properties

@@ -1,29 +0,0 @@
- ## Debug Settings
-hibernate.show_sql=true
-hibernate.format_sql=true
-hibernate.use_sql_comments=true
-
-hibernate.connection.driver_class=org.sqlite.JDBC
-
-hibernate.connection.url=jdbc\:sqlite\:default.sqlite
-
-## Database Creation Mode (validate | update | create | create-drop)
-hibernate.hbm2ddl.auto=validate
-
-hibernate.dialect=perftoolutils.SQLiteDialect
-
-teneo.naming.join_column_naming_strategy=simple
-
-## Teneo Settings
-teneo.mapping.disable_econtainer=true
-teneo.mapping.always_version=false
-teneo.mapping.inheritance=JOINED
-teneo.naming.sql_fk_name_prefix=fk_
-teneo.naming.set_foreign_key_name=true
-hibernate.jdbc.batch_size=30
-
-## Teneo Cache Settings
-#hibernate.cache.use_second_level_cache=false
-#hibernate.cache.use_query_cache=false
-#teneo.mapping.default_cache_strategy=NONE
-#hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory

WFRperfTool/dbmodel/WFRperfToolModel.ecore

@@ -93,6 +93,8 @@
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="deviceID" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deviceSubID" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="newStatus" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="oldStatus" lowerBound="1"

WFRperfTool/representations.aird

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<viewpoint:DAnalysis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xmi:id="_nyCUEF_4EeeD7cFYS_Ewxg" version="12.0.0.201704271200">
+  <semanticResources>dbmodel/WFRperfToolModel.ecore</semanticResources>
+  <semanticResources>http://www.eclipse.org/emf/2002/Ecore</semanticResources>
+  <semanticResources>dbmodel/WFRperfToolModel.ecorediag</semanticResources>
+  <semanticResources>dbmodel/WFRperfToolModel.genmodel</semanticResources>
+</viewpoint:DAnalysis>

WFRperfTool/src/at/ac/uibk/wfr/perftool/Activity.java

@@ -12,6 +12,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.Activity#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.Activity#getActid <em>Actid</em>}</li>
@@ -24,7 +25,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link at.ac.uibk.wfr.perftool.Activity#getParent <em>Parent</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.Activity#getChildren <em>Children</em>}</li>
  * </ul>
- * </p>
  *
  * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getActivity()
  * @model

WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityInstance.java

@@ -12,6 +12,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.ActivityInstance#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.ActivityInstance#getInstid <em>Instid</em>}</li>
@@ -21,7 +22,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link at.ac.uibk.wfr.perftool.ActivityInstance#getParentInstance <em>Parent Instance</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.ActivityInstance#getStatusEvents <em>Status Events</em>}</li>
  * </ul>
- * </p>
  *
  * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getActivityInstance()
  * @model

WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityInstanceStatusEvent.java

@@ -11,6 +11,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.ActivityInstanceStatusEvent#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.ActivityInstanceStatusEvent#getNewStatus <em>New Status</em>}</li>
@@ -18,7 +19,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link at.ac.uibk.wfr.perftool.ActivityInstanceStatusEvent#getTimestamp <em>Timestamp</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.ActivityInstanceStatusEvent#getParentInstance <em>Parent Instance</em>}</li>
  * </ul>
- * </p>
  *
  * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getActivityInstanceStatusEvent()
  * @model

WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityStatusEvent.java

@@ -11,6 +11,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.ActivityStatusEvent#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.ActivityStatusEvent#getNewStatus <em>New Status</em>}</li>
@@ -18,7 +19,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link at.ac.uibk.wfr.perftool.ActivityStatusEvent#getTimestamp <em>Timestamp</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.ActivityStatusEvent#getParentActivity <em>Parent Activity</em>}</li>
  * </ul>
- * </p>
  *
  * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getActivityStatusEvent()
  * @model

WFRperfTool/src/at/ac/uibk/wfr/perftool/ComponentStatusEvent.java

@@ -11,6 +11,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.ComponentStatusEvent#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.ComponentStatusEvent#getComponentType <em>Component Type</em>}</li>
@@ -19,7 +20,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link at.ac.uibk.wfr.perftool.ComponentStatusEvent#getTimestamp <em>Timestamp</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.ComponentStatusEvent#getWorkflow <em>Workflow</em>}</li>
  * </ul>
- * </p>
  *
  * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getComponentStatusEvent()
  * @model

WFRperfTool/src/at/ac/uibk/wfr/perftool/DeviceInstanceStatusEvent.java

@@ -11,10 +11,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getDeviceType <em>Device Type</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getDeviceID <em>Device ID</em>}</li>
+ *   <li>{@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getDeviceSubID <em>Device Sub ID</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getNewStatus <em>New Status</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getOldStatus <em>Old Status</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getTimestamp <em>Timestamp</em>}</li>
@@ -23,7 +25,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getParentWorkflow <em>Parent Workflow</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getExecutedInstance <em>Executed Instance</em>}</li>
  * </ul>
- * </p>
  *
  * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getDeviceInstanceStatusEvent()
  * @model
@@ -108,6 +109,32 @@ public interface DeviceInstanceStatusEvent extends EObject {
 	 */
 	void setDeviceID(long value);
 
+	/**
+	 * Returns the value of the '<em><b>Device Sub ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Device Sub ID</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Device Sub ID</em>' attribute.
+	 * @see #setDeviceSubID(long)
+	 * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getDeviceInstanceStatusEvent_DeviceSubID()
+	 * @model required="true"
+	 * @generated
+	 */
+	long getDeviceSubID();
+
+	/**
+	 * Sets the value of the '{@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getDeviceSubID <em>Device Sub ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Device Sub ID</em>' attribute.
+	 * @see #getDeviceSubID()
+	 * @generated
+	 */
+	void setDeviceSubID(long value);
+
 	/**
 	 * Returns the value of the '<em><b>New Status</b></em>' attribute.
 	 * <!-- begin-user-doc -->

WFRperfTool/src/at/ac/uibk/wfr/perftool/PerftoolPackage.java

@@ -624,6 +624,15 @@ public interface PerftoolPackage extends EPackage {
 	 */
 	int DEVICE_INSTANCE_STATUS_EVENT__DEVICE_ID = 2;
 
+	/**
+	 * The feature id for the '<em><b>Device Sub ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SUB_ID = 3;
+
 	/**
 	 * The feature id for the '<em><b>New Status</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -631,7 +640,7 @@ public interface PerftoolPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int DEVICE_INSTANCE_STATUS_EVENT__NEW_STATUS = 3;
+	int DEVICE_INSTANCE_STATUS_EVENT__NEW_STATUS = 4;
 
 	/**
 	 * The feature id for the '<em><b>Old Status</b></em>' attribute.
@@ -640,7 +649,7 @@ public interface PerftoolPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int DEVICE_INSTANCE_STATUS_EVENT__OLD_STATUS = 4;
+	int DEVICE_INSTANCE_STATUS_EVENT__OLD_STATUS = 5;
 
 	/**
 	 * The feature id for the '<em><b>Timestamp</b></em>' attribute.
@@ -649,7 +658,7 @@ public interface PerftoolPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int DEVICE_INSTANCE_STATUS_EVENT__TIMESTAMP = 5;
+	int DEVICE_INSTANCE_STATUS_EVENT__TIMESTAMP = 6;
 
 	/**
 	 * The feature id for the '<em><b>Executed Impl ID</b></em>' attribute.
@@ -658,7 +667,7 @@ public interface PerftoolPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int DEVICE_INSTANCE_STATUS_EVENT__EXECUTED_IMPL_ID = 6;
+	int DEVICE_INSTANCE_STATUS_EVENT__EXECUTED_IMPL_ID = 7;
 
 	/**
 	 * The feature id for the '<em><b>Device Slot Count</b></em>' attribute.
@@ -667,7 +676,7 @@ public interface PerftoolPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SLOT_COUNT = 7;
+	int DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SLOT_COUNT = 8;
 
 	/**
 	 * The feature id for the '<em><b>Parent Workflow</b></em>' container reference.
@@ -676,7 +685,7 @@ public interface PerftoolPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int DEVICE_INSTANCE_STATUS_EVENT__PARENT_WORKFLOW = 8;
+	int DEVICE_INSTANCE_STATUS_EVENT__PARENT_WORKFLOW = 9;
 
 	/**
 	 * The feature id for the '<em><b>Executed Instance</b></em>' reference.
@@ -685,7 +694,7 @@ public interface PerftoolPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int DEVICE_INSTANCE_STATUS_EVENT__EXECUTED_INSTANCE = 9;
+	int DEVICE_INSTANCE_STATUS_EVENT__EXECUTED_INSTANCE = 10;
 
 	/**
 	 * The number of structural features of the '<em>Device Instance Status Event</em>' class.
@@ -694,7 +703,7 @@ public interface PerftoolPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int DEVICE_INSTANCE_STATUS_EVENT_FEATURE_COUNT = 10;
+	int DEVICE_INSTANCE_STATUS_EVENT_FEATURE_COUNT = 11;
 
 	/**
 	 * The number of operations of the '<em>Device Instance Status Event</em>' class.
@@ -1332,6 +1341,17 @@ public interface PerftoolPackage extends EPackage {
 	 */
 	EAttribute getDeviceInstanceStatusEvent_DeviceID();
 
+	/**
+	 * Returns the meta object for the attribute '{@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getDeviceSubID <em>Device Sub ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Device Sub ID</em>'.
+	 * @see at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getDeviceSubID()
+	 * @see #getDeviceInstanceStatusEvent()
+	 * @generated
+	 */
+	EAttribute getDeviceInstanceStatusEvent_DeviceSubID();
+
 	/**
 	 * Returns the meta object for the attribute '{@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getNewStatus <em>New Status</em>}'.
 	 * <!-- begin-user-doc -->
@@ -1922,6 +1942,14 @@ public interface PerftoolPackage extends EPackage {
 		 */
 		EAttribute DEVICE_INSTANCE_STATUS_EVENT__DEVICE_ID = eINSTANCE.getDeviceInstanceStatusEvent_DeviceID();
 
+		/**
+		 * The meta object literal for the '<em><b>Device Sub ID</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SUB_ID = eINSTANCE.getDeviceInstanceStatusEvent_DeviceSubID();
+
 		/**
 		 * The meta object literal for the '<em><b>New Status</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->

WFRperfTool/src/at/ac/uibk/wfr/perftool/Workflow.java

@@ -13,6 +13,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.Workflow#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.Workflow#getWfid <em>Wfid</em>}</li>
@@ -23,7 +24,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link at.ac.uibk.wfr.perftool.Workflow#getDeviceEvents <em>Device Events</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.Workflow#getComponentEvents <em>Component Events</em>}</li>
  * </ul>
- * </p>
  *
  * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getWorkflow()
  * @model

WFRperfTool/src/at/ac/uibk/wfr/perftool/WorkflowStatusEvent.java

@@ -11,6 +11,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.WorkflowStatusEvent#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.WorkflowStatusEvent#getNewStatus <em>New Status</em>}</li>
@@ -18,7 +19,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link at.ac.uibk.wfr.perftool.WorkflowStatusEvent#getTimestamp <em>Timestamp</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.WorkflowStatusEvent#getParentWorkflow <em>Parent Workflow</em>}</li>
  * </ul>
- * </p>
  *
  * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getWorkflowStatusEvent()
  * @model

WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityImpl.java

@@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityImpl#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityImpl#getActid <em>Actid</em>}</li>
@@ -41,7 +42,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityImpl#getParent <em>Parent</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityImpl#getChildren <em>Children</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */

WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityInstanceImpl.java

@@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceImpl#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceImpl#getInstid <em>Instid</em>}</li>
@@ -38,7 +39,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceImpl#getParentInstance <em>Parent Instance</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceImpl#getStatusEvents <em>Status Events</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */

WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityInstanceStatusEventImpl.java

@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceStatusEventImpl#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceStatusEventImpl#getNewStatus <em>New Status</em>}</li>
@@ -30,7 +31,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceStatusEventImpl#getTimestamp <em>Timestamp</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceStatusEventImpl#getParentInstance <em>Parent Instance</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */

WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityStatusEventImpl.java

@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityStatusEventImpl#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityStatusEventImpl#getNewStatus <em>New Status</em>}</li>
@@ -30,7 +31,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityStatusEventImpl#getTimestamp <em>Timestamp</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ActivityStatusEventImpl#getParentActivity <em>Parent Activity</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */

WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ComponentStatusEventImpl.java

@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ComponentStatusEventImpl#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ComponentStatusEventImpl#getComponentType <em>Component Type</em>}</li>
@@ -31,7 +32,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ComponentStatusEventImpl#getTimestamp <em>Timestamp</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.ComponentStatusEventImpl#getWorkflow <em>Workflow</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */

WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/DeviceInstanceStatusEventImpl.java

@@ -24,10 +24,12 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getDeviceType <em>Device Type</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getDeviceID <em>Device ID</em>}</li>
+ *   <li>{@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getDeviceSubID <em>Device Sub ID</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getNewStatus <em>New Status</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getOldStatus <em>Old Status</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getTimestamp <em>Timestamp</em>}</li>
@@ -36,7 +38,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getParentWorkflow <em>Parent Workflow</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getExecutedInstance <em>Executed Instance</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -101,6 +102,26 @@ public class DeviceInstanceStatusEventImpl extends MinimalEObjectImpl.Container
 	 */
 	protected long deviceID = DEVICE_ID_EDEFAULT;
 
+	/**
+	 * The default value of the '{@link #getDeviceSubID() <em>Device Sub ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeviceSubID()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final long DEVICE_SUB_ID_EDEFAULT = 0L;
+
+	/**
+	 * The cached value of the '{@link #getDeviceSubID() <em>Device Sub ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeviceSubID()
+	 * @generated
+	 * @ordered
+	 */
+	protected long deviceSubID = DEVICE_SUB_ID_EDEFAULT;
+
 	/**
 	 * The default value of the '{@link #getNewStatus() <em>New Status</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -293,6 +314,27 @@ public class DeviceInstanceStatusEventImpl extends MinimalEObjectImpl.Container
 			eNotify(new ENotificationImpl(this, Notification.SET, PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_ID, oldDeviceID, deviceID));
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public long getDeviceSubID() {
+		return deviceSubID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDeviceSubID(long newDeviceSubID) {
+		long oldDeviceSubID = deviceSubID;
+		deviceSubID = newDeviceSubID;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SUB_ID, oldDeviceSubID, deviceSubID));
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -535,6 +577,8 @@ public class DeviceInstanceStatusEventImpl extends MinimalEObjectImpl.Container
 				return getDeviceType();
 			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_ID:
 				return getDeviceID();
+			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SUB_ID:
+				return getDeviceSubID();
 			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__NEW_STATUS:
 				return getNewStatus();
 			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__OLD_STATUS:
@@ -571,6 +615,9 @@ public class DeviceInstanceStatusEventImpl extends MinimalEObjectImpl.Container
 			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_ID:
 				setDeviceID((Long)newValue);
 				return;
+			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SUB_ID:
+				setDeviceSubID((Long)newValue);
+				return;
 			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__NEW_STATUS:
 				setNewStatus((String)newValue);
 				return;
@@ -613,6 +660,9 @@ public class DeviceInstanceStatusEventImpl extends MinimalEObjectImpl.Container
 			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_ID:
 				setDeviceID(DEVICE_ID_EDEFAULT);
 				return;
+			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SUB_ID:
+				setDeviceSubID(DEVICE_SUB_ID_EDEFAULT);
+				return;
 			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__NEW_STATUS:
 				setNewStatus(NEW_STATUS_EDEFAULT);
 				return;
@@ -652,6 +702,8 @@ public class DeviceInstanceStatusEventImpl extends MinimalEObjectImpl.Container
 				return DEVICE_TYPE_EDEFAULT == null ? deviceType != null : !DEVICE_TYPE_EDEFAULT.equals(deviceType);
 			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_ID:
 				return deviceID != DEVICE_ID_EDEFAULT;
+			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SUB_ID:
+				return deviceSubID != DEVICE_SUB_ID_EDEFAULT;
 			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__NEW_STATUS:
 				return NEW_STATUS_EDEFAULT == null ? newStatus != null : !NEW_STATUS_EDEFAULT.equals(newStatus);
 			case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__OLD_STATUS:
@@ -686,6 +738,8 @@ public class DeviceInstanceStatusEventImpl extends MinimalEObjectImpl.Container
 		result.append(deviceType);
 		result.append(", deviceID: ");
 		result.append(deviceID);
+		result.append(", deviceSubID: ");
+		result.append(deviceSubID);
 		result.append(", newStatus: ");
 		result.append(newStatus);
 		result.append(", oldStatus: ");

WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/PerftoolPackageImpl.java

@@ -599,7 +599,7 @@ public class PerftoolPackageImpl extends EPackageImpl implements PerftoolPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getDeviceInstanceStatusEvent_NewStatus() {
+	public EAttribute getDeviceInstanceStatusEvent_DeviceSubID() {
 		return (EAttribute)deviceInstanceStatusEventEClass.getEStructuralFeatures().get(3);
 	}
 
@@ -608,7 +608,7 @@ public class PerftoolPackageImpl extends EPackageImpl implements PerftoolPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getDeviceInstanceStatusEvent_OldStatus() {
+	public EAttribute getDeviceInstanceStatusEvent_NewStatus() {
 		return (EAttribute)deviceInstanceStatusEventEClass.getEStructuralFeatures().get(4);
 	}
 
@@ -617,7 +617,7 @@ public class PerftoolPackageImpl extends EPackageImpl implements PerftoolPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getDeviceInstanceStatusEvent_Timestamp() {
+	public EAttribute getDeviceInstanceStatusEvent_OldStatus() {
 		return (EAttribute)deviceInstanceStatusEventEClass.getEStructuralFeatures().get(5);
 	}
 
@@ -626,7 +626,7 @@ public class PerftoolPackageImpl extends EPackageImpl implements PerftoolPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getDeviceInstanceStatusEvent_ExecutedImplID() {
+	public EAttribute getDeviceInstanceStatusEvent_Timestamp() {
 		return (EAttribute)deviceInstanceStatusEventEClass.getEStructuralFeatures().get(6);
 	}
 
@@ -635,17 +635,26 @@ public class PerftoolPackageImpl extends EPackageImpl implements PerftoolPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getDeviceInstanceStatusEvent_DeviceSlotCount() {
+	public EAttribute getDeviceInstanceStatusEvent_ExecutedImplID() {
 		return (EAttribute)deviceInstanceStatusEventEClass.getEStructuralFeatures().get(7);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDeviceInstanceStatusEvent_DeviceSlotCount() {
+		return (EAttribute)deviceInstanceStatusEventEClass.getEStructuralFeatures().get(8);
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	public EReference getDeviceInstanceStatusEvent_ParentWorkflow() {
-		return (EReference)deviceInstanceStatusEventEClass.getEStructuralFeatures().get(8);
+		return (EReference)deviceInstanceStatusEventEClass.getEStructuralFeatures().get(9);
 	}
 
 	/**
@@ -654,7 +663,7 @@ public class PerftoolPackageImpl extends EPackageImpl implements PerftoolPackage
 	 * @generated
 	 */
 	public EReference getDeviceInstanceStatusEvent_ExecutedInstance() {
-		return (EReference)deviceInstanceStatusEventEClass.getEStructuralFeatures().get(9);
+		return (EReference)deviceInstanceStatusEventEClass.getEStructuralFeatures().get(10);
 	}
 
 	/**
@@ -804,6 +813,7 @@ public class PerftoolPackageImpl extends EPackageImpl implements PerftoolPackage
 		createEAttribute(deviceInstanceStatusEventEClass, DEVICE_INSTANCE_STATUS_EVENT__OID);
 		createEAttribute(deviceInstanceStatusEventEClass, DEVICE_INSTANCE_STATUS_EVENT__DEVICE_TYPE);
 		createEAttribute(deviceInstanceStatusEventEClass, DEVICE_INSTANCE_STATUS_EVENT__DEVICE_ID);
+		createEAttribute(deviceInstanceStatusEventEClass, DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SUB_ID);
 		createEAttribute(deviceInstanceStatusEventEClass, DEVICE_INSTANCE_STATUS_EVENT__NEW_STATUS);
 		createEAttribute(deviceInstanceStatusEventEClass, DEVICE_INSTANCE_STATUS_EVENT__OLD_STATUS);
 		createEAttribute(deviceInstanceStatusEventEClass, DEVICE_INSTANCE_STATUS_EVENT__TIMESTAMP);
@@ -907,6 +917,7 @@ public class PerftoolPackageImpl extends EPackageImpl implements PerftoolPackage
 		initEAttribute(getDeviceInstanceStatusEvent_Oid(), ecorePackage.getEInt(), "oid", null, 1, 1, DeviceInstanceStatusEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getDeviceInstanceStatusEvent_DeviceType(), ecorePackage.getEString(), "deviceType", null, 1, 1, DeviceInstanceStatusEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getDeviceInstanceStatusEvent_DeviceID(), ecorePackage.getELong(), "deviceID", null, 1, 1, DeviceInstanceStatusEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDeviceInstanceStatusEvent_DeviceSubID(), ecorePackage.getELong(), "deviceSubID", null, 1, 1, DeviceInstanceStatusEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getDeviceInstanceStatusEvent_NewStatus(), ecorePackage.getEString(), "newStatus", null, 1, 1, DeviceInstanceStatusEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getDeviceInstanceStatusEvent_OldStatus(), ecorePackage.getEString(), "oldStatus", null, 1, 1, DeviceInstanceStatusEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getDeviceInstanceStatusEvent_Timestamp(), ecorePackage.getELong(), "timestamp", null, 1, 1, DeviceInstanceStatusEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/WorkflowImpl.java

@@ -31,6 +31,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.WorkflowImpl#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.WorkflowImpl#getWfid <em>Wfid</em>}</li>
@@ -41,7 +42,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.WorkflowImpl#getDeviceEvents <em>Device Events</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.WorkflowImpl#getComponentEvents <em>Component Events</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */

WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/WorkflowStatusEventImpl.java

@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.WorkflowStatusEventImpl#getOid <em>Oid</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.WorkflowStatusEventImpl#getNewStatus <em>New Status</em>}</li>
@@ -30,7 +31,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.WorkflowStatusEventImpl#getTimestamp <em>Timestamp</em>}</li>
  *   <li>{@link at.ac.uibk.wfr.perftool.impl.WorkflowStatusEventImpl#getParentWorkflow <em>Parent Workflow</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */

WFRperfTool/src/at/ac/uibk/wfr/perftool/util/PerftoolSwitch.java

@@ -47,7 +47,7 @@ public class PerftoolSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */