diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e10e727 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.metadata/ diff --git a/WFRperfTool.edit/.classpath b/WFRperfTool.edit/.classpath old mode 100755 new mode 100644 index 121e527..eca7bdb --- a/WFRperfTool.edit/.classpath +++ b/WFRperfTool.edit/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/WFRperfTool.edit/.project b/WFRperfTool.edit/.project old mode 100755 new mode 100644 index 34cf512..6866e3b --- a/WFRperfTool.edit/.project +++ b/WFRperfTool.edit/.project @@ -22,7 +22,7 @@ - org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature diff --git a/WFRperfTool.edit/.settings/org.eclipse.jdt.core.prefs b/WFRperfTool.edit/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..0c68a61 --- /dev/null +++ b/WFRperfTool.edit/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +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.8 diff --git a/WFRperfTool.edit/META-INF/MANIFEST.MF b/WFRperfTool.edit/META-INF/MANIFEST.MF index c41b7d7..78ce6c9 100755 --- a/WFRperfTool.edit/META-INF/MANIFEST.MF +++ b/WFRperfTool.edit/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName +Bundle-Name: Edit Bundle-SymbolicName: WFRperfTool.edit;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: at.ac.uibk.wfr.perftool.provider.WFRperfToolModelEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: at.ac.uibk.wfr.perftool.provider +Export-Package: at.ac.uibk.wfr.perftool.provider;version="1.0.0.qualifier" Require-Bundle: org.eclipse.core.runtime, WFRperfTool;visibility:=reexport, org.eclipse.emf.edit;visibility:=reexport +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/WFRperfTool.edit/bin/.gitignore b/WFRperfTool.edit/bin/.gitignore new file mode 100644 index 0000000..745f576 --- /dev/null +++ b/WFRperfTool.edit/bin/.gitignore @@ -0,0 +1 @@ +/at/ diff --git a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ActivityInstanceItemProvider.class b/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ActivityInstanceItemProvider.class deleted file mode 100755 index b893cdf..0000000 Binary files a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ActivityInstanceItemProvider.class and /dev/null differ diff --git a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ActivityInstanceStatusEventItemProvider.class b/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ActivityInstanceStatusEventItemProvider.class deleted file mode 100755 index b3caf86..0000000 Binary files a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ActivityInstanceStatusEventItemProvider.class and /dev/null differ diff --git a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ActivityItemProvider.class b/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ActivityItemProvider.class deleted file mode 100755 index f30e0fd..0000000 Binary files a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ActivityItemProvider.class and /dev/null differ diff --git a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ActivityStatusEventItemProvider.class b/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ActivityStatusEventItemProvider.class deleted file mode 100755 index 4ccd48c..0000000 Binary files a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ActivityStatusEventItemProvider.class and /dev/null differ diff --git a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ComponentStatusEventItemProvider.class b/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ComponentStatusEventItemProvider.class deleted file mode 100755 index 4f47afd..0000000 Binary files a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/ComponentStatusEventItemProvider.class and /dev/null differ diff --git a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/DeviceInstanceStatusEventItemProvider.class b/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/DeviceInstanceStatusEventItemProvider.class deleted file mode 100755 index 4c4bf68..0000000 Binary files a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/DeviceInstanceStatusEventItemProvider.class and /dev/null differ diff --git a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/PerftoolItemProviderAdapterFactory.class b/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/PerftoolItemProviderAdapterFactory.class deleted file mode 100755 index 7021011..0000000 Binary files a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/PerftoolItemProviderAdapterFactory.class and /dev/null differ diff --git a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/WFRperfToolModelEditPlugin$Implementation.class b/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/WFRperfToolModelEditPlugin$Implementation.class deleted file mode 100755 index 8edac0e..0000000 Binary files a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/WFRperfToolModelEditPlugin$Implementation.class and /dev/null differ diff --git a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/WFRperfToolModelEditPlugin.class b/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/WFRperfToolModelEditPlugin.class deleted file mode 100755 index 39af7a5..0000000 Binary files a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/WFRperfToolModelEditPlugin.class and /dev/null differ diff --git a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/WorkflowItemProvider.class b/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/WorkflowItemProvider.class deleted file mode 100755 index 83c349d..0000000 Binary files a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/WorkflowItemProvider.class and /dev/null differ diff --git a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/WorkflowStatusEventItemProvider.class b/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/WorkflowStatusEventItemProvider.class deleted file mode 100755 index e0f6b31..0000000 Binary files a/WFRperfTool.edit/bin/at/ac/uibk/wfr/perftool/provider/WorkflowStatusEventItemProvider.class and /dev/null differ diff --git a/WFRperfTool.edit/plugin.properties b/WFRperfTool.edit/plugin.properties index fa5f63f..9f83f14 100755 --- a/WFRperfTool.edit/plugin.properties +++ b/WFRperfTool.edit/plugin.properties @@ -82,3 +82,4 @@ _UI_ComponentStatusEvent_timestamp_feature = Timestamp _UI_ComponentStatusEvent_workflow_feature = Workflow _UI_Unknown_feature = Unspecified +_UI_DeviceInstanceStatusEvent_deviceSubID_feature = Device Sub ID diff --git a/WFRperfTool.edit/src/at/ac/uibk/wfr/perftool/provider/DeviceInstanceStatusEventItemProvider.java b/WFRperfTool.edit/src/at/ac/uibk/wfr/perftool/provider/DeviceInstanceStatusEventItemProvider.java index f8a2133..0cdca78 100755 --- a/WFRperfTool.edit/src/at/ac/uibk/wfr/perftool/provider/DeviceInstanceStatusEventItemProvider.java +++ b/WFRperfTool.edit/src/at/ac/uibk/wfr/perftool/provider/DeviceInstanceStatusEventItemProvider.java @@ -63,6 +63,7 @@ public class DeviceInstanceStatusEventItemProvider addOidPropertyDescriptor(object); addDeviceTypePropertyDescriptor(object); addDeviceIDPropertyDescriptor(object); + addDeviceSubIDPropertyDescriptor(object); addNewStatusPropertyDescriptor(object); addOldStatusPropertyDescriptor(object); addTimestampPropertyDescriptor(object); @@ -139,6 +140,28 @@ public class DeviceInstanceStatusEventItemProvider null)); } + /** + * This adds a property descriptor for the Device Sub ID feature. + * + * + * @generated + */ + protected void addDeviceSubIDPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_DeviceInstanceStatusEvent_deviceSubID_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_DeviceInstanceStatusEvent_deviceSubID_feature", "_UI_DeviceInstanceStatusEvent_type"), + PerftoolPackage.Literals.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SUB_ID, + true, + false, + false, + ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, + null, + null)); + } + /** * This adds a property descriptor for the New Status feature. * @@ -309,6 +332,7 @@ public class DeviceInstanceStatusEventItemProvider case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__OID: case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_TYPE: case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_ID: + case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SUB_ID: case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__NEW_STATUS: case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__OLD_STATUS: case PerftoolPackage.DEVICE_INSTANCE_STATUS_EVENT__TIMESTAMP: diff --git a/WFRperfTool.editor/.classpath b/WFRperfTool.editor/.classpath old mode 100755 new mode 100644 index 2b1b33e..eca7bdb --- a/WFRperfTool.editor/.classpath +++ b/WFRperfTool.editor/.classpath @@ -1,8 +1,7 @@ - - - + + diff --git a/WFRperfTool.editor/.project b/WFRperfTool.editor/.project old mode 100755 new mode 100644 index 4a79406..0a8bb36 --- a/WFRperfTool.editor/.project +++ b/WFRperfTool.editor/.project @@ -22,7 +22,7 @@ - org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature diff --git a/WFRperfTool.editor/.settings/org.eclipse.jdt.core.prefs b/WFRperfTool.editor/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..0c68a61 --- /dev/null +++ b/WFRperfTool.editor/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +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.8 diff --git a/WFRperfTool.editor/META-INF/MANIFEST.MF b/WFRperfTool.editor/META-INF/MANIFEST.MF index 67bd1ef..696553c 100755 --- a/WFRperfTool.editor/META-INF/MANIFEST.MF +++ b/WFRperfTool.editor/META-INF/MANIFEST.MF @@ -1,34 +1,28 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName +Bundle-Name: Editor Bundle-SymbolicName: WFRperfTool.editor;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: ., - libs/sqlite-jdbc-3.7.2.jar + libs/sqlite-jdbc-3.7.2.jar Bundle-Activator: at.ac.uibk.wfr.perftool.presentation.WFRperfToolModelEditorPlugin$Implementation -Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: at.ac.uibk.wfr.perftool.presentation -Require-Bundle: org.eclipse.core.runtime, - WFRperfTool.edit;visibility:=reexport, - org.eclipse.emf.ecore.xmi;visibility:=reexport, - org.eclipse.emf.edit.ui;visibility:=reexport, - org.eclipse.emf.teneo.hibernate;bundle-version="2.0.1", - org.hibernate;bundle-version="4.1.1", - org.eclipse.birt;bundle-version="4.2.2", - org.eclipse.birt.chart.engine;bundle-version="4.2.2", - org.eclipse.birt.chart.device.swt;bundle-version="4.2.2", - org.eclipse.birt.chart.device.extension;bundle-version="4.2.2", - org.eclipse.birt.chart.device.pdf;bundle-version="4.2.2", - org.eclipse.birt.chart.device.svg;bundle-version="4.2.2", - org.eclipse.birt.chart.engine.extension;bundle-version="4.2.2", - org.eclipse.birt.chart.reportitem;bundle-version="4.2.2", - org.eclipse.birt.chart.reportitem.ui;bundle-version="4.2.2", - org.eclipse.birt.chart.ui;bundle-version="4.2.2", - org.eclipse.birt.chart.ui.extension;bundle-version="4.2.2", - org.eclipse.birt.core.script.function;bundle-version="4.2.2", - org.eclipse.birt.core.ui;bundle-version="4.2.2", - org.eclipse.birt.data;bundle-version="4.2.2", - org.eclipse.birt.data.aggregation;bundle-version="4.2.2" +Export-Package: at.ac.uibk.wfr.perftool.deviceeventstimeline, + at.ac.uibk.wfr.perftool.perftooleditor, + at.ac.uibk.wfr.perftool.presentation, + at.ac.uibk.wfr.perftool.view, + at.ac.uibk.wfr.perftool.wfreventview +Require-Bundle: WFRperfTool.edit;visibility:=reexport, + org.eclipse.emf.edit.ui;visibility:=reexport, + org.eclipse.emf.teneo.hibernate, + org.hibernate, + org.eclipse.birt.chart.engine.extension, + org.eclipse.birt.chart.ui, + org.eclipse.birt.data, + org.eclipse.e4.ui.services;bundle-version="1.3.0", + org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="2.0.300", + org.eclipse.e4.core.services;bundle-version="2.1.0", + org.eclipse.e4.ui.css.swt.theme;bundle-version="0.11.0", + org.eclipse.e4.core.commands;bundle-version="0.12.100" +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/WFRperfTool.editor/bin/.gitignore b/WFRperfTool.editor/bin/.gitignore new file mode 100644 index 0000000..745f576 --- /dev/null +++ b/WFRperfTool.editor/bin/.gitignore @@ -0,0 +1 @@ +/at/ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/deviceeventstimeline/BirtChartCanvas.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/deviceeventstimeline/BirtChartCanvas.class deleted file mode 100755 index cea26e1..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/deviceeventstimeline/BirtChartCanvas.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/deviceeventstimeline/BirtChartCanvasController.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/deviceeventstimeline/BirtChartCanvasController.class deleted file mode 100755 index 3a407c3..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/deviceeventstimeline/BirtChartCanvasController.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/deviceeventstimeline/DeviceEventsTimelineEditorPart$1DeviceInstanceEntry.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/deviceeventstimeline/DeviceEventsTimelineEditorPart$1DeviceInstanceEntry.class deleted file mode 100755 index 38f5223..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/deviceeventstimeline/DeviceEventsTimelineEditorPart$1DeviceInstanceEntry.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/deviceeventstimeline/DeviceEventsTimelineEditorPart.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/deviceeventstimeline/DeviceEventsTimelineEditorPart.class deleted file mode 100755 index 178feea..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/deviceeventstimeline/DeviceEventsTimelineEditorPart.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/perftooleditor/OverviewTreeComparator.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/perftooleditor/OverviewTreeComparator.class deleted file mode 100755 index 30fbb5a..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/perftooleditor/OverviewTreeComparator.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor$1.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor$1.class deleted file mode 100755 index 060bd7c..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor$1.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor$2.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor$2.class deleted file mode 100755 index d47d78d..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor$2.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor$3.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor$3.class deleted file mode 100755 index 807cec4..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor$3.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor$NewAction.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor$NewAction.class deleted file mode 100755 index fdd5e02..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor$NewAction.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor.class deleted file mode 100755 index 3bace32..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolActionBarContributor.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$1.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$1.class deleted file mode 100755 index 0b8c8a5..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$1.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$10.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$10.class deleted file mode 100755 index 49de1fd..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$10.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$11.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$11.class deleted file mode 100755 index 3af5477..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$11.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$12.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$12.class deleted file mode 100755 index 7f44497..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$12.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$1MyContentOutlinePage.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$1MyContentOutlinePage.class deleted file mode 100755 index addfd6b..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$1MyContentOutlinePage.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$2$1.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$2$1.class deleted file mode 100755 index 93df622..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$2$1.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$2$2.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$2$2.class deleted file mode 100755 index 8daf6ef..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$2$2.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$2.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$2.class deleted file mode 100755 index b4971fe..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$2.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$3$1.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$3$1.class deleted file mode 100755 index 5fc9e4f..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$3$1.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$3.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$3.class deleted file mode 100755 index 8c0d8c3..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$3.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$4.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$4.class deleted file mode 100755 index 89577be..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$4.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$5.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$5.class deleted file mode 100755 index ac564aa..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$5.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$6.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$6.class deleted file mode 100755 index 101ac8b..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$6.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$7.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$7.class deleted file mode 100755 index 78bdcfb..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$7.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$8.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$8.class deleted file mode 100755 index 57c8aa0..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$8.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$9.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$9.class deleted file mode 100755 index 56032a1..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$9.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$ReverseAdapterFactoryContentProvider.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$ReverseAdapterFactoryContentProvider.class deleted file mode 100755 index e2649ee..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor$ReverseAdapterFactoryContentProvider.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor.class deleted file mode 100755 index ab7aeae..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolEditor.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard$1.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard$1.class deleted file mode 100755 index fd39e0d..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard$1.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard$PerftoolModelWizardInitialObjectCreationPage$1.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard$PerftoolModelWizardInitialObjectCreationPage$1.class deleted file mode 100755 index 8828395..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard$PerftoolModelWizardInitialObjectCreationPage$1.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard$PerftoolModelWizardInitialObjectCreationPage$2.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard$PerftoolModelWizardInitialObjectCreationPage$2.class deleted file mode 100755 index e4d35da..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard$PerftoolModelWizardInitialObjectCreationPage$2.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard$PerftoolModelWizardInitialObjectCreationPage.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard$PerftoolModelWizardInitialObjectCreationPage.class deleted file mode 100755 index 0da306b..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard$PerftoolModelWizardInitialObjectCreationPage.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard.class deleted file mode 100755 index 4416c9f..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/PerftoolModelWizard.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$AboutAction.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$AboutAction.class deleted file mode 100755 index 48d0339..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$AboutAction.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$Application.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$Application.class deleted file mode 100755 index 0f90cfd..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$Application.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$OpenAction.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$OpenAction.class deleted file mode 100755 index 7b23230..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$OpenAction.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$OpenURIAction.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$OpenURIAction.class deleted file mode 100755 index b360e9d..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$OpenURIAction.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$Perspective.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$Perspective.class deleted file mode 100755 index d12af64..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$Perspective.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$WindowActionBarAdvisor.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$WindowActionBarAdvisor.class deleted file mode 100755 index 3287270..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$WindowActionBarAdvisor.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$WindowAdvisor.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$WindowAdvisor.class deleted file mode 100755 index 709b9a6..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor$WindowAdvisor.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor.class deleted file mode 100755 index 118e114..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorAdvisor.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorPlugin$Implementation.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorPlugin$Implementation.class deleted file mode 100755 index ff79500..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorPlugin$Implementation.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorPlugin.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorPlugin.class deleted file mode 100755 index 2774a49..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/WFRperfToolModelEditorPlugin.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/teneo.properties b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/teneo.properties deleted file mode 100755 index ddfb453..0000000 --- a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/presentation/teneo.properties +++ /dev/null @@ -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 \ No newline at end of file diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/view/WFREventView$1.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/view/WFREventView$1.class deleted file mode 100755 index 1d12daa..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/view/WFREventView$1.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/view/WFREventView.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/view/WFREventView.class deleted file mode 100755 index 410bc7f..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/view/WFREventView.class and /dev/null differ diff --git a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/wfreventview/WFREventViewResource.class b/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/wfreventview/WFREventViewResource.class deleted file mode 100755 index 82b6fcb..0000000 Binary files a/WFRperfTool.editor/bin/at/ac/uibk/wfr/perftool/wfreventview/WFREventViewResource.class and /dev/null differ diff --git a/WFRperfTool.editor/src/at/ac/uibk/wfr/perftool/deviceeventstimeline/BirtChartCanvas.java b/WFRperfTool.editor/src/at/ac/uibk/wfr/perftool/deviceeventstimeline/BirtChartCanvas.java index 1b8d6fa..3ac26f9 100755 --- a/WFRperfTool.editor/src/at/ac/uibk/wfr/perftool/deviceeventstimeline/BirtChartCanvas.java +++ b/WFRperfTool.editor/src/at/ac/uibk/wfr/perftool/deviceeventstimeline/BirtChartCanvas.java @@ -135,7 +135,9 @@ public class BirtChartCanvas extends Canvas implements Listener, ICallBackNotifi if ( !isDisposed() ) { final Generator gr = Generator.instance( ); try { - gr.refresh( state ); + if (state != null) { + gr.refresh( state ); + } } catch ( Exception ex ) { ex.printStackTrace( ); } diff --git a/WFRperfTool.editor/src/at/ac/uibk/wfr/perftool/deviceeventstimeline/DeviceEventsTimelineEditorPart.java b/WFRperfTool.editor/src/at/ac/uibk/wfr/perftool/deviceeventstimeline/DeviceEventsTimelineEditorPart.java index 44f24d4..fcf73a1 100755 --- a/WFRperfTool.editor/src/at/ac/uibk/wfr/perftool/deviceeventstimeline/DeviceEventsTimelineEditorPart.java +++ b/WFRperfTool.editor/src/at/ac/uibk/wfr/perftool/deviceeventstimeline/DeviceEventsTimelineEditorPart.java @@ -138,10 +138,11 @@ public class DeviceEventsTimelineEditorPart extends EditorPart implements ISelec class DeviceInstanceEntry { public long deviceID; + public long deviceSubID; public Vector events = new Vector(); } int totalDeviceInstanceCount = 0; - HashMap> deviceMap = new HashMap>(); + HashMap>> deviceMap = new HashMap>>(); List componentEvents = null; if (selectedWorkflow != null) { HbDataStore hds = hResource.getEMFDataStore(); @@ -166,25 +167,26 @@ public class DeviceEventsTimelineEditorPart extends EditorPart implements ISelec DeviceInstanceStatusEvent e = (DeviceInstanceStatusEvent) rs.get(t); String type = e.getDeviceType(); long deviceID = e.getDeviceID(); - HashMap dm = deviceMap.get(type); + long deviceSubID = e.getDeviceSubID(); + HashMap> dm = deviceMap.get(type); if (dm == null) { - dm = new HashMap(); - DeviceInstanceEntry de = new DeviceInstanceEntry(); - de.deviceID = e.getDeviceID(); - de.events.add(e); - dm.put(de.deviceID, de); + dm = new HashMap>(); deviceMap.put(type, dm); - totalDeviceInstanceCount++; - } else { - DeviceInstanceEntry de = dm.get(e.getDeviceID()); - if (de == null) { - de = new DeviceInstanceEntry(); - de.deviceID = e.getDeviceID(); - dm.put(de.deviceID, de); - totalDeviceInstanceCount++; - } - de.events.add(e); } + HashMap dsm = dm.get(deviceID); + if (dsm == null) { + dsm = new HashMap(); + dm.put(deviceID, dsm); + } + DeviceInstanceEntry de = dsm.get(deviceSubID); + if (de == null) { + de = new DeviceInstanceEntry(); + dsm.put(deviceSubID, de); + de.deviceID = deviceID; + de.deviceSubID = deviceSubID; + totalDeviceInstanceCount++; + } + de.events.add(e); } query = session.createQuery("from ComponentStatusEvent " + "where workflow = :wf and componentType = :type"); @@ -244,11 +246,15 @@ public class DeviceEventsTimelineEditorPart extends EditorPart implements ISelec // Data Set String[] deviceStringArray = new String[totalDeviceInstanceCount + 1]; - int i = 0; + int i = totalDeviceInstanceCount - 1; for (String s : deviceMap.keySet()) { - for (Long l : deviceMap.get(s).keySet()) { - deviceStringArray[i] = s + "[" + l + "]"; - i++; + HashMap> dm = deviceMap.get(s); + for (Long l : dm.keySet()) { + HashMap dsm = dm.get(l); + for (Long sl : dsm.keySet()) { + deviceStringArray[i] = s + "[" + l + "][" + sl + "]"; + i--; + } } } deviceStringArray[totalDeviceInstanceCount] = "Enactment Thread"; @@ -263,73 +269,76 @@ public class DeviceEventsTimelineEditorPart extends EditorPart implements ISelec sdX.getSeriesPalette().shift(0); SeriesDefinition sdY1 = SeriesDefinitionImpl.create(); - //sdY1.getSeriesPalette().shift(0); + sdY1.getSeriesPalette().shift(0); yAxisPrimary.getSeriesDefinitions().add(sdY1); - i = 0; + i = totalDeviceInstanceCount - 1; for (String s : deviceMap.keySet()) { - HashMap dm = deviceMap.get(s); - for (Long l : deviceMap.get(s).keySet()) { - DeviceInstanceEntry de = dm.get(l); - DeviceInstanceStatusEvent lastEvent = null; - for (DeviceInstanceStatusEvent e : de.events) { - if (e.getNewStatus().equalsIgnoreCase("FinishedTask")) { - if (!lastEvent.getNewStatus().equalsIgnoreCase("ExecutingTask")) { - throw new Error("ERROR"); - } - GanttEntry[] ges = new GanttEntry[totalDeviceInstanceCount + 1]; - for (int t = 0; t < totalDeviceInstanceCount + 1; t++) { - if (t == i) { - long lastTimeStamp = lastEvent.getTimestamp(); - long startms = (lastTimeStamp - wfstarttime)/1000000; // timestamps are in nanoseconds - long endms = (e.getTimestamp() - wfstarttime)/1000000; - ges[t] = new GanttEntry( new CDateTime(startms), - new CDateTime(endms), - ""); - } else { - //ges[t] = new GanttEntry(new CDateTime(0), new CDateTime(0), ""); - ges[t] = new GanttEntry((CDateTime)null, (CDateTime)null, ""); + HashMap> dm1 = deviceMap.get(s); + for (Long l : dm1.keySet()) { + HashMap dsm = dm1.get(l); + for (Long sl : dsm.keySet()) { + DeviceInstanceEntry de = dsm.get(sl); + DeviceInstanceStatusEvent lastEvent = null; + for (DeviceInstanceStatusEvent e : de.events) { + if (e.getNewStatus().equalsIgnoreCase("FinishedTask")) { + if (!lastEvent.getNewStatus().equalsIgnoreCase("ExecutingTask")) { + throw new Error("ERROR"); } - } - GanttDataSet gds = GanttDataSetImpl.create( ges ); - GanttSeries gs = (GanttSeries) GanttSeriesImpl.create( ); - gs.setDataSet( gds ); - gs.getLabel( ).setVisible( false ); - sdY1.getSeries().add(gs); - ActivityInstance ei = e.getExecutedInstance(); - if (ei != null) { - long startTime = -1; - long stopTime = -1; - long readyTime = -1; - for (ActivityInstanceStatusEvent se : ei.getStatusEvents()) { - if (se.getNewStatus().equalsIgnoreCase("Running")) { - startTime = se.getTimestamp(); - } else if (se.getNewStatus().equalsIgnoreCase("Finished")) { - stopTime = se.getTimestamp(); - } else if (se.getNewStatus().equalsIgnoreCase("ReadyForExecution")) { - readyTime = se.getTimestamp(); + GanttEntry[] ges = new GanttEntry[totalDeviceInstanceCount + 1]; + for (int t = 0; t < totalDeviceInstanceCount + 1; t++) { + if (t == i) { + long lastTimeStamp = lastEvent.getTimestamp(); + long startms = (lastTimeStamp - wfstarttime)/1000000; // timestamps are in nanoseconds + long endms = (e.getTimestamp() - wfstarttime)/1000000; + ges[t] = new GanttEntry( new CDateTime(startms), + new CDateTime(endms), + ""); + } else { + //ges[t] = new GanttEntry(new CDateTime(0), new CDateTime(0), ""); + ges[t] = new GanttEntry((CDateTime)null, (CDateTime)null, ""); } } - String text = ei.getBaseActivity().getName() + " (InstanceID " + ei.getInstid() + ", ImplementationID " + e.getExecutedImplID(); - if (readyTime >= 0 && startTime >= readyTime) { - text += ", Waittime " + ((double)(startTime - readyTime)/1000000000.0) + " s"; - } - if (startTime >= 0 && stopTime >= readyTime) { - text += ", Runtime " + ((double)(stopTime - startTime)/1000000000.0) + " s"; - } - text += ")"; - gs.getTriggers( ).add( TriggerImpl.create( TriggerCondition.ONMOUSEOVER_LITERAL, - ActionImpl.create( ActionType.CALL_BACK_LITERAL, - CallBackValueImpl.create( text ) ) ) ); - gs.getTriggers( ).add( TriggerImpl.create( TriggerCondition.ONMOUSEOUT_LITERAL, - ActionImpl.create( ActionType.CALL_BACK_LITERAL, - CallBackValueImpl.create( null ) ) ) ); - } - + GanttDataSet gds = GanttDataSetImpl.create( ges ); + GanttSeries gs = (GanttSeries) GanttSeriesImpl.create( ); + gs.setDataSet( gds ); + gs.getLabel( ).setVisible( false ); + sdY1.getSeries().add(gs); + ActivityInstance ei = e.getExecutedInstance(); + if (ei != null) { + long startTime = -1; + long stopTime = -1; + long readyTime = -1; + for (ActivityInstanceStatusEvent se : ei.getStatusEvents()) { + if (se.getNewStatus().equalsIgnoreCase("Running")) { + startTime = se.getTimestamp(); + } else if (se.getNewStatus().equalsIgnoreCase("Finished")) { + stopTime = se.getTimestamp(); + } else if (se.getNewStatus().equalsIgnoreCase("ReadyForExecution")) { + readyTime = se.getTimestamp(); + } + } + String text = ei.getBaseActivity().getName() + " (InstanceID " + ei.getInstid() + ", ImplementationID " + e.getExecutedImplID(); + if (readyTime >= 0 && startTime >= readyTime) { + text += ", Waittime " + ((double)(startTime - readyTime)/1000000000.0) + " s"; + } + if (startTime >= 0 && stopTime >= readyTime) { + text += ", Runtime " + ((double)(stopTime - startTime)/1000000000.0) + " s"; + } + text += ")"; + gs.getTriggers( ).add( TriggerImpl.create( TriggerCondition.ONMOUSEOVER_LITERAL, + ActionImpl.create( ActionType.CALL_BACK_LITERAL, + CallBackValueImpl.create( text ) ) ) ); + gs.getTriggers( ).add( TriggerImpl.create( TriggerCondition.ONMOUSEOUT_LITERAL, + ActionImpl.create( ActionType.CALL_BACK_LITERAL, + CallBackValueImpl.create( null ) ) ) ); + } + + } + lastEvent = e; } - lastEvent = e; + i--; } - i++; } } ComponentStatusEvent lastEvent = null; diff --git a/WFRperfTool/.classpath b/WFRperfTool/.classpath old mode 100755 new mode 100644 index d131682..eca7bdb --- a/WFRperfTool/.classpath +++ b/WFRperfTool/.classpath @@ -1,7 +1,6 @@ - - + diff --git a/WFRperfTool/.project b/WFRperfTool/.project old mode 100755 new mode 100644 index 878d849..71035be --- a/WFRperfTool/.project +++ b/WFRperfTool/.project @@ -22,6 +22,7 @@ + org.eclipse.sirius.nature.modelingproject org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/WFRperfTool/.settings/org.eclipse.core.resources.prefs b/WFRperfTool/.settings/org.eclipse.core.resources.prefs deleted file mode 100755 index a85a27a..0000000 --- a/WFRperfTool/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//dbmodel/WFRperfToolModel.ecore=UTF-8 -encoding//dbmodel/WFRperfToolModel.ecorediag=UTF-8 diff --git a/WFRperfTool/.settings/org.eclipse.jdt.core.prefs b/WFRperfTool/.settings/org.eclipse.jdt.core.prefs old mode 100755 new mode 100644 index c537b63..0c68a61 --- a/WFRperfTool/.settings/org.eclipse.jdt.core.prefs +++ b/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 diff --git a/WFRperfTool/META-INF/MANIFEST.MF b/WFRperfTool/META-INF/MANIFEST.MF index ba8b263..5d1d549 100755 --- a/WFRperfTool/META-INF/MANIFEST.MF +++ b/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 diff --git a/WFRperfTool/bin/.gitignore b/WFRperfTool/bin/.gitignore new file mode 100644 index 0000000..745f576 --- /dev/null +++ b/WFRperfTool/bin/.gitignore @@ -0,0 +1 @@ +/at/ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/Activity.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/Activity.class deleted file mode 100755 index c51725a..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/Activity.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/ActivityInstance.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/ActivityInstance.class deleted file mode 100755 index 1726877..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/ActivityInstance.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/ActivityInstanceStatusEvent.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/ActivityInstanceStatusEvent.class deleted file mode 100755 index 28adb07..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/ActivityInstanceStatusEvent.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/ActivityStatusEvent.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/ActivityStatusEvent.class deleted file mode 100755 index 9ed47bf..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/ActivityStatusEvent.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/ComponentStatusEvent.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/ComponentStatusEvent.class deleted file mode 100755 index 583b9a8..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/ComponentStatusEvent.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/DeviceInstanceStatusEvent.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/DeviceInstanceStatusEvent.class deleted file mode 100755 index 1fd7353..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/DeviceInstanceStatusEvent.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/PerftoolFactory.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/PerftoolFactory.class deleted file mode 100755 index b21b40d..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/PerftoolFactory.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/PerftoolPackage$Literals.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/PerftoolPackage$Literals.class deleted file mode 100755 index 467969e..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/PerftoolPackage$Literals.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/PerftoolPackage.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/PerftoolPackage.class deleted file mode 100755 index cf07ca2..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/PerftoolPackage.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/Workflow.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/Workflow.class deleted file mode 100755 index e974329..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/Workflow.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/WorkflowStatusEvent.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/WorkflowStatusEvent.class deleted file mode 100755 index 1dbdc36..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/WorkflowStatusEvent.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ActivityImpl.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ActivityImpl.class deleted file mode 100755 index 6c1add5..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ActivityImpl.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ActivityInstanceImpl.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ActivityInstanceImpl.class deleted file mode 100755 index beafec2..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ActivityInstanceImpl.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ActivityInstanceStatusEventImpl.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ActivityInstanceStatusEventImpl.class deleted file mode 100755 index e406e13..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ActivityInstanceStatusEventImpl.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ActivityStatusEventImpl.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ActivityStatusEventImpl.class deleted file mode 100755 index e1c1b69..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ActivityStatusEventImpl.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ComponentStatusEventImpl.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ComponentStatusEventImpl.class deleted file mode 100755 index 997b33d..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/ComponentStatusEventImpl.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/DeviceInstanceStatusEventImpl.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/DeviceInstanceStatusEventImpl.class deleted file mode 100755 index c73e921..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/DeviceInstanceStatusEventImpl.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/PerftoolFactoryImpl.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/PerftoolFactoryImpl.class deleted file mode 100755 index b9fa0fd..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/PerftoolFactoryImpl.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/PerftoolPackageImpl.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/PerftoolPackageImpl.class deleted file mode 100755 index aacd4f5..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/PerftoolPackageImpl.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/WorkflowImpl.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/WorkflowImpl.class deleted file mode 100755 index 06f1d77..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/WorkflowImpl.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/WorkflowStatusEventImpl.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/WorkflowStatusEventImpl.class deleted file mode 100755 index 034758e..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/impl/WorkflowStatusEventImpl.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/util/PerftoolAdapterFactory$1.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/util/PerftoolAdapterFactory$1.class deleted file mode 100755 index c6b9d68..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/util/PerftoolAdapterFactory$1.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/util/PerftoolAdapterFactory.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/util/PerftoolAdapterFactory.class deleted file mode 100755 index 53caa8a..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/util/PerftoolAdapterFactory.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/util/PerftoolSwitch.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/util/PerftoolSwitch.class deleted file mode 100755 index c9da624..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/util/PerftoolSwitch.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ActivityInstanceStatusEventValidator.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ActivityInstanceStatusEventValidator.class deleted file mode 100755 index b3d9d92..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ActivityInstanceStatusEventValidator.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ActivityInstanceValidator.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ActivityInstanceValidator.class deleted file mode 100755 index 34b3b97..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ActivityInstanceValidator.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ActivityStatusEventValidator.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ActivityStatusEventValidator.class deleted file mode 100755 index a29f11e..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ActivityStatusEventValidator.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ActivityValidator.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ActivityValidator.class deleted file mode 100755 index 8954030..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ActivityValidator.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ComponentStatusEventValidator.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ComponentStatusEventValidator.class deleted file mode 100755 index c09841c..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/ComponentStatusEventValidator.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/DeviceInstanceStatusEventValidator.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/DeviceInstanceStatusEventValidator.class deleted file mode 100755 index 2d52675..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/DeviceInstanceStatusEventValidator.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/WorkflowStatusEventValidator.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/WorkflowStatusEventValidator.class deleted file mode 100755 index 842fdbf..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/WorkflowStatusEventValidator.class and /dev/null differ diff --git a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/WorkflowValidator.class b/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/WorkflowValidator.class deleted file mode 100755 index e004c93..0000000 Binary files a/WFRperfTool/bin/at/ac/uibk/wfr/perftool/validation/WorkflowValidator.class and /dev/null differ diff --git a/WFRperfTool/bin/perftoolutils/DBCreator.class b/WFRperfTool/bin/perftoolutils/DBCreator.class deleted file mode 100755 index e47a783..0000000 Binary files a/WFRperfTool/bin/perftoolutils/DBCreator.class and /dev/null differ diff --git a/WFRperfTool/bin/perftoolutils/MySQLNameStrategy.class b/WFRperfTool/bin/perftoolutils/MySQLNameStrategy.class deleted file mode 100755 index b034d5b..0000000 Binary files a/WFRperfTool/bin/perftoolutils/MySQLNameStrategy.class and /dev/null differ diff --git a/WFRperfTool/bin/perftoolutils/SQLiteDialect$1.class b/WFRperfTool/bin/perftoolutils/SQLiteDialect$1.class deleted file mode 100755 index f95ba3e..0000000 Binary files a/WFRperfTool/bin/perftoolutils/SQLiteDialect$1.class and /dev/null differ diff --git a/WFRperfTool/bin/perftoolutils/SQLiteDialect.class b/WFRperfTool/bin/perftoolutils/SQLiteDialect.class deleted file mode 100755 index 1b8bcd2..0000000 Binary files a/WFRperfTool/bin/perftoolutils/SQLiteDialect.class and /dev/null differ diff --git a/WFRperfTool/bin/perftoolutils/teneo.properties b/WFRperfTool/bin/perftoolutils/teneo.properties deleted file mode 100755 index a254519..0000000 --- a/WFRperfTool/bin/perftoolutils/teneo.properties +++ /dev/null @@ -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 \ No newline at end of file diff --git a/WFRperfTool/dbmodel/WFRperfToolModel.ecore b/WFRperfTool/dbmodel/WFRperfToolModel.ecore index b5430c9..6aa8eba 100755 --- a/WFRperfTool/dbmodel/WFRperfToolModel.ecore +++ b/WFRperfTool/dbmodel/WFRperfToolModel.ecore @@ -93,6 +93,8 @@ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + + + dbmodel/WFRperfToolModel.ecore + http://www.eclipse.org/emf/2002/Ecore + dbmodel/WFRperfToolModel.ecorediag + dbmodel/WFRperfToolModel.genmodel + diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/Activity.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/Activity.java index 715c0ff..6039057 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/Activity.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/Activity.java @@ -12,6 +12,7 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.Activity#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.Activity#getActid Actid}
    • @@ -24,7 +25,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link at.ac.uibk.wfr.perftool.Activity#getParent Parent}
    • *
  • {@link at.ac.uibk.wfr.perftool.Activity#getChildren Children}
    • *
- *

* * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getActivity() * @model diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityInstance.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityInstance.java index 0e0fff6..9b9a583 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityInstance.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityInstance.java @@ -12,6 +12,7 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.ActivityInstance#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.ActivityInstance#getInstid Instid}
    • @@ -21,7 +22,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link at.ac.uibk.wfr.perftool.ActivityInstance#getParentInstance Parent Instance}
    • *
  • {@link at.ac.uibk.wfr.perftool.ActivityInstance#getStatusEvents Status Events}
    • *
- *

* * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getActivityInstance() * @model diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityInstanceStatusEvent.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityInstanceStatusEvent.java index 0d4df00..e718b62 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityInstanceStatusEvent.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityInstanceStatusEvent.java @@ -11,6 +11,7 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.ActivityInstanceStatusEvent#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.ActivityInstanceStatusEvent#getNewStatus New Status}
    • @@ -18,7 +19,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link at.ac.uibk.wfr.perftool.ActivityInstanceStatusEvent#getTimestamp Timestamp}
    • *
  • {@link at.ac.uibk.wfr.perftool.ActivityInstanceStatusEvent#getParentInstance Parent Instance}
    • *
- *

* * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getActivityInstanceStatusEvent() * @model diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityStatusEvent.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityStatusEvent.java index 1559aab..a874afa 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityStatusEvent.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/ActivityStatusEvent.java @@ -11,6 +11,7 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.ActivityStatusEvent#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.ActivityStatusEvent#getNewStatus New Status}
    • @@ -18,7 +19,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link at.ac.uibk.wfr.perftool.ActivityStatusEvent#getTimestamp Timestamp}
    • *
  • {@link at.ac.uibk.wfr.perftool.ActivityStatusEvent#getParentActivity Parent Activity}
    • *
- *

* * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getActivityStatusEvent() * @model diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/ComponentStatusEvent.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/ComponentStatusEvent.java index 0bf96d5..12fd55a 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/ComponentStatusEvent.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/ComponentStatusEvent.java @@ -11,6 +11,7 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.ComponentStatusEvent#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.ComponentStatusEvent#getComponentType Component Type}
    • @@ -19,7 +20,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link at.ac.uibk.wfr.perftool.ComponentStatusEvent#getTimestamp Timestamp}
    • *
  • {@link at.ac.uibk.wfr.perftool.ComponentStatusEvent#getWorkflow Workflow}
    • *
- *

* * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getComponentStatusEvent() * @model diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/DeviceInstanceStatusEvent.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/DeviceInstanceStatusEvent.java index 37ce49a..c0e591a 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/DeviceInstanceStatusEvent.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/DeviceInstanceStatusEvent.java @@ -11,10 +11,12 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getDeviceType Device Type}
    • *
  • {@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getDeviceID Device ID}
    • + *
  • {@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getDeviceSubID Device Sub ID}
    • *
  • {@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getNewStatus New Status}
    • *
  • {@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getOldStatus Old Status}
    • *
  • {@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getTimestamp Timestamp}
    • @@ -23,7 +25,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getParentWorkflow Parent Workflow}
    • *
  • {@link at.ac.uibk.wfr.perftool.DeviceInstanceStatusEvent#getExecutedInstance Executed Instance}
    • *
- *

* * @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 'Device Sub ID' attribute. + * + *

+ * If the meaning of the 'Device Sub ID' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Device Sub ID' 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 Device Sub ID}' attribute. + * + * + * @param value the new value of the 'Device Sub ID' attribute. + * @see #getDeviceSubID() + * @generated + */ + void setDeviceSubID(long value); + /** * Returns the value of the 'New Status' attribute. * diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/PerftoolPackage.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/PerftoolPackage.java index 744d710..44e6147 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/PerftoolPackage.java +++ b/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 'Device Sub ID' attribute. + * + * + * @generated + * @ordered + */ + int DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SUB_ID = 3; + /** * The feature id for the 'New Status' attribute. * @@ -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 'Old Status' 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 'Timestamp' 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 'Executed Impl ID' 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 'Device Slot Count' 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 'Parent Workflow' 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 'Executed Instance' 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 'Device Instance Status Event' 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 'Device Instance Status Event' 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 Device Sub ID}'. + * + * + * @return the meta object for the attribute 'Device Sub ID'. + * @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 New Status}'. * @@ -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 'Device Sub ID' attribute feature. + * + * + * @generated + */ + EAttribute DEVICE_INSTANCE_STATUS_EVENT__DEVICE_SUB_ID = eINSTANCE.getDeviceInstanceStatusEvent_DeviceSubID(); + /** * The meta object literal for the 'New Status' attribute feature. * diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/Workflow.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/Workflow.java index 0d09501..9249575 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/Workflow.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/Workflow.java @@ -13,6 +13,7 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.Workflow#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.Workflow#getWfid Wfid}
    • @@ -23,7 +24,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link at.ac.uibk.wfr.perftool.Workflow#getDeviceEvents Device Events}
    • *
  • {@link at.ac.uibk.wfr.perftool.Workflow#getComponentEvents Component Events}
    • *
- *

* * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getWorkflow() * @model diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/WorkflowStatusEvent.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/WorkflowStatusEvent.java index 9eb42a9..5db0625 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/WorkflowStatusEvent.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/WorkflowStatusEvent.java @@ -11,6 +11,7 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.WorkflowStatusEvent#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.WorkflowStatusEvent#getNewStatus New Status}
    • @@ -18,7 +19,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link at.ac.uibk.wfr.perftool.WorkflowStatusEvent#getTimestamp Timestamp}
    • *
  • {@link at.ac.uibk.wfr.perftool.WorkflowStatusEvent#getParentWorkflow Parent Workflow}
    • *
- *

* * @see at.ac.uibk.wfr.perftool.PerftoolPackage#getWorkflowStatusEvent() * @model diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityImpl.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityImpl.java index b12e649..a0f0acc 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityImpl.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityImpl.java @@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * *

* The following features are implemented: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityImpl#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityImpl#getActid Actid}
    • @@ -41,7 +42,6 @@ import org.eclipse.emf.ecore.util.InternalEList; *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityImpl#getParent Parent}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityImpl#getChildren Children}
    • *
- *

* * @generated */ diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityInstanceImpl.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityInstanceImpl.java index 86fd259..dbf0674 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityInstanceImpl.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityInstanceImpl.java @@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * *

* The following features are implemented: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceImpl#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceImpl#getInstid Instid}
    • @@ -38,7 +39,6 @@ import org.eclipse.emf.ecore.util.InternalEList; *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceImpl#getParentInstance Parent Instance}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceImpl#getStatusEvents Status Events}
    • *
- *

* * @generated */ diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityInstanceStatusEventImpl.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityInstanceStatusEventImpl.java index 1b6a3b1..07d8f09 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityInstanceStatusEventImpl.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityInstanceStatusEventImpl.java @@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * *

* The following features are implemented: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceStatusEventImpl#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceStatusEventImpl#getNewStatus New Status}
    • @@ -30,7 +31,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil; *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceStatusEventImpl#getTimestamp Timestamp}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityInstanceStatusEventImpl#getParentInstance Parent Instance}
    • *
- *

* * @generated */ diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityStatusEventImpl.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityStatusEventImpl.java index f63cd31..cf56647 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityStatusEventImpl.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ActivityStatusEventImpl.java @@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * *

* The following features are implemented: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityStatusEventImpl#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityStatusEventImpl#getNewStatus New Status}
    • @@ -30,7 +31,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil; *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityStatusEventImpl#getTimestamp Timestamp}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.ActivityStatusEventImpl#getParentActivity Parent Activity}
    • *
- *

* * @generated */ diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ComponentStatusEventImpl.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ComponentStatusEventImpl.java index 555328c..9beda58 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ComponentStatusEventImpl.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/ComponentStatusEventImpl.java @@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * *

* The following features are implemented: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.impl.ComponentStatusEventImpl#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.ComponentStatusEventImpl#getComponentType Component Type}
    • @@ -31,7 +32,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil; *
  • {@link at.ac.uibk.wfr.perftool.impl.ComponentStatusEventImpl#getTimestamp Timestamp}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.ComponentStatusEventImpl#getWorkflow Workflow}
    • *
- *

* * @generated */ diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/DeviceInstanceStatusEventImpl.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/DeviceInstanceStatusEventImpl.java index 6bbd7a4..a75481a 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/DeviceInstanceStatusEventImpl.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/DeviceInstanceStatusEventImpl.java @@ -24,10 +24,12 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * *

* The following features are implemented: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getDeviceType Device Type}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getDeviceID Device ID}
    • + *
  • {@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getDeviceSubID Device Sub ID}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getNewStatus New Status}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getOldStatus Old Status}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getTimestamp Timestamp}
    • @@ -36,7 +38,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil; *
  • {@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getParentWorkflow Parent Workflow}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.DeviceInstanceStatusEventImpl#getExecutedInstance Executed Instance}
    • *
- *

* * @generated */ @@ -101,6 +102,26 @@ public class DeviceInstanceStatusEventImpl extends MinimalEObjectImpl.Container */ protected long deviceID = DEVICE_ID_EDEFAULT; + /** + * The default value of the '{@link #getDeviceSubID() Device Sub ID}' attribute. + * + * + * @see #getDeviceSubID() + * @generated + * @ordered + */ + protected static final long DEVICE_SUB_ID_EDEFAULT = 0L; + + /** + * The cached value of the '{@link #getDeviceSubID() Device Sub ID}' attribute. + * + * + * @see #getDeviceSubID() + * @generated + * @ordered + */ + protected long deviceSubID = DEVICE_SUB_ID_EDEFAULT; + /** * The default value of the '{@link #getNewStatus() New Status}' attribute. * @@ -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)); } + /** + * + * + * @generated + */ + public long getDeviceSubID() { + return deviceSubID; + } + + /** + * + * + * @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)); + } + /** * * @@ -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: "); diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/PerftoolPackageImpl.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/PerftoolPackageImpl.java index af53204..c9f9c72 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/PerftoolPackageImpl.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/PerftoolPackageImpl.java @@ -599,7 +599,7 @@ public class PerftoolPackageImpl extends EPackageImpl implements PerftoolPackage * * @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 * * @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 * * @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 * * @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 * * @generated */ - public EAttribute getDeviceInstanceStatusEvent_DeviceSlotCount() { + public EAttribute getDeviceInstanceStatusEvent_ExecutedImplID() { return (EAttribute)deviceInstanceStatusEventEClass.getEStructuralFeatures().get(7); } + /** + * + * + * @generated + */ + public EAttribute getDeviceInstanceStatusEvent_DeviceSlotCount() { + return (EAttribute)deviceInstanceStatusEventEClass.getEStructuralFeatures().get(8); + } + /** * * * @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); diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/WorkflowImpl.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/WorkflowImpl.java index 4d220a4..81f0585 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/WorkflowImpl.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/WorkflowImpl.java @@ -31,6 +31,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * *

* The following features are implemented: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.impl.WorkflowImpl#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.WorkflowImpl#getWfid Wfid}
    • @@ -41,7 +42,6 @@ import org.eclipse.emf.ecore.util.InternalEList; *
  • {@link at.ac.uibk.wfr.perftool.impl.WorkflowImpl#getDeviceEvents Device Events}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.WorkflowImpl#getComponentEvents Component Events}
    • *
- *

* * @generated */ diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/WorkflowStatusEventImpl.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/WorkflowStatusEventImpl.java index c76e746..79d45f2 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/WorkflowStatusEventImpl.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/impl/WorkflowStatusEventImpl.java @@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * *

* The following features are implemented: + *

*
    *
  • {@link at.ac.uibk.wfr.perftool.impl.WorkflowStatusEventImpl#getOid Oid}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.WorkflowStatusEventImpl#getNewStatus New Status}
    • @@ -30,7 +31,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil; *
  • {@link at.ac.uibk.wfr.perftool.impl.WorkflowStatusEventImpl#getTimestamp Timestamp}
    • *
  • {@link at.ac.uibk.wfr.perftool.impl.WorkflowStatusEventImpl#getParentWorkflow Parent Workflow}
    • *
- *

* * @generated */ diff --git a/WFRperfTool/src/at/ac/uibk/wfr/perftool/util/PerftoolSwitch.java b/WFRperfTool/src/at/ac/uibk/wfr/perftool/util/PerftoolSwitch.java index 43b6c12..9074da3 100755 --- a/WFRperfTool/src/at/ac/uibk/wfr/perftool/util/PerftoolSwitch.java +++ b/WFRperfTool/src/at/ac/uibk/wfr/perftool/util/PerftoolSwitch.java @@ -47,7 +47,7 @@ public class PerftoolSwitch extends Switch { * Checks whether this is a switch for the given package. * * - * @parameter ePackage the package in question. + * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated */