From e075274434242bb549a4e69a884b32ba67e100c4 Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Thu, 8 Mar 2012 12:04:02 -0500 Subject: [PATCH] Generalize and move the Histogram view from LTTng to TMF --- .../lttng/ui/tests/AllLTTngUITests.java | 1 - .../META-INF/MANIFEST.MF | 1 - org.eclipse.linuxtools.lttng.ui/plugin.xml | 9 ------- .../lttng/ui/views/PerspectiveFactory.java | 4 +-- .../distribution/model/DistributionData.java | 1 + .../ui/views/latency/AbstractViewer.java | 2 +- .../ui/views/latency/HistogramViewer.java | 6 ++--- .../latency/listeners/GraphPaintListener.java | 4 +-- .../listeners/HistogramPaintListener.java | 6 ++--- .../views/latency/model/GraphScaledData.java | 2 +- .../views/latency/model/IGraphDataModel.java | 2 +- .../latency/model/LatencyController.java | 6 ++--- .../tmf/ui/tests/AllTmfUITests.java | 1 + .../tmf}/ui/tests/histogram/AllTests.java | 2 +- .../histogram/HistogramDataModelTest.java | 8 +++--- .../META-INF/MANIFEST.MF | 2 ++ .../icons/eview16/histogram.gif | Bin .../plugin.properties | 1 + org.eclipse.linuxtools.tmf.ui/plugin.xml | 9 +++++++ .../model/BaseDistributionData.java | 9 +++++-- .../model/IBaseDistributionModel.java | 5 ++-- .../views/histogram/FullTraceHistogram.java | 5 ++-- .../tmf}/ui/views/histogram/Histogram.java | 5 ++-- .../HistogramCurrentTimeControl.java | 5 ++-- .../views/histogram/HistogramDataModel.java | 22 ++++++++--------- .../ui/views/histogram/HistogramRequest.java | 15 ++++++------ .../views/histogram/HistogramScaledData.java | 7 ++++-- .../views/histogram/HistogramTextControl.java | 5 ++-- .../histogram/HistogramTimeRangeControl.java | 5 ++-- .../ui/views/histogram/HistogramUtils.java | 5 ++-- .../ui/views/histogram/HistogramView.java | 23 +++++++++--------- .../ui/views/histogram/HistogramZoom.java | 10 ++++---- .../views/histogram/IHistogramDataModel.java | 10 +++++--- .../histogram/IHistogramModelListener.java | 6 +++-- .../tmf}/ui/views/histogram/Messages.java | 7 +++--- .../views/histogram/TimeRangeHistogram.java | 7 +++--- .../ui/views/histogram/messages.properties | 0 37 files changed, 122 insertions(+), 96 deletions(-) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf}/ui/tests/histogram/AllTests.java (93%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf}/ui/tests/histogram/HistogramDataModelTest.java (98%) rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.tmf.ui}/icons/eview16/histogram.gif (100%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/distribution/model/BaseDistributionData.java (96%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/distribution/model/IBaseDistributionModel.java (82%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/FullTraceHistogram.java (97%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/Histogram.java (99%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/HistogramCurrentTimeControl.java (92%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/HistogramDataModel.java (94%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/HistogramRequest.java (83%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/HistogramScaledData.java (95%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/HistogramTextControl.java (97%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/HistogramTimeRangeControl.java (92%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/HistogramUtils.java (96%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/HistogramView.java (95%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/HistogramZoom.java (97%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/IHistogramDataModel.java (84%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/IHistogramModelListener.java (82%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/Messages.java (88%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/TimeRangeHistogram.java (92%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf}/ui/views/histogram/messages.properties (100%) diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java index ab6fe78934..87e6a9f557 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java @@ -8,7 +8,6 @@ public class AllLTTngUITests { TestSuite suite = new TestSuite(AllLTTngUITests.class.getName()); //$JUnit-BEGIN$ suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.distribution.AllTests.suite()); - suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.histogram.AllTests.suite()); //$JUnit-END$ return suite; } diff --git a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF index 0513f0bc02..6e0795f130 100644 --- a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF @@ -40,7 +40,6 @@ Export-Package: org.eclipse.linuxtools.lttng.ui;x-friends:="org.eclipse.linuxtoo org.eclipse.linuxtools.lttng.ui.views.controlflow.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", org.eclipse.linuxtools.lttng.ui.views.distribution.model, org.eclipse.linuxtools.lttng.ui.views.events;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", - org.eclipse.linuxtools.lttng.ui.views.histogram;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", org.eclipse.linuxtools.lttng.ui.views.latency;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", org.eclipse.linuxtools.lttng.ui.views.latency.dialogs;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", org.eclipse.linuxtools.lttng.ui.views.latency.listeners;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", diff --git a/org.eclipse.linuxtools.lttng.ui/plugin.xml b/org.eclipse.linuxtools.lttng.ui/plugin.xml index 510683c467..9d2197ccfb 100644 --- a/org.eclipse.linuxtools.lttng.ui/plugin.xml +++ b/org.eclipse.linuxtools.lttng.ui/plugin.xml @@ -63,15 +63,6 @@ name="%statistics.view.name" restorable="true"> - - PerspectiveFactory *

- * TODO: Implement me. Please. + * The default LTTng perspective. */ public class PerspectiveFactory implements IPerspectiveFactory { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/DistributionData.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/DistributionData.java index 75e3286bd0..360958a91f 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/DistributionData.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/DistributionData.java @@ -12,6 +12,7 @@ package org.eclipse.linuxtools.lttng.ui.views.distribution.model; import org.eclipse.linuxtools.lttng.ui.views.latency.model.Config; +import org.eclipse.linuxtools.tmf.ui.views.distribution.model.BaseDistributionData; /** * DistributionData diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/AbstractViewer.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/AbstractViewer.java index 75597d693b..e9086220ea 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/AbstractViewer.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/AbstractViewer.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.linuxtools.lttng.ui.views.latency; -import org.eclipse.linuxtools.lttng.ui.views.distribution.model.IBaseDistributionModel; import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.AbstractMouseListener; import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.AbstractMouseTrackListener; import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.AbstractPaintListener; import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.ZoomListener; +import org.eclipse.linuxtools.tmf.ui.views.distribution.model.IBaseDistributionModel; import org.eclipse.swt.SWT; import org.eclipse.swt.SWTException; import org.eclipse.swt.widgets.Canvas; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/HistogramViewer.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/HistogramViewer.java index 96860d3a7f..e4219b5b77 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/HistogramViewer.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/HistogramViewer.java @@ -13,12 +13,12 @@ *******************************************************************************/ package org.eclipse.linuxtools.lttng.ui.views.latency; -import org.eclipse.linuxtools.lttng.ui.views.histogram.HistogramDataModel; -import org.eclipse.linuxtools.lttng.ui.views.histogram.IHistogramDataModel; -import org.eclipse.linuxtools.lttng.ui.views.histogram.IHistogramModelListener; import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.HistogramPaintListener; import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.TooltipListener; import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.ZoomListener; +import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramDataModel; +import org.eclipse.linuxtools.tmf.ui.views.histogram.IHistogramDataModel; +import org.eclipse.linuxtools.tmf.ui.views.histogram.IHistogramModelListener; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/GraphPaintListener.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/GraphPaintListener.java index a6732c2fee..7b27eb65bf 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/GraphPaintListener.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/GraphPaintListener.java @@ -15,13 +15,13 @@ package org.eclipse.linuxtools.lttng.ui.views.latency.listeners; import java.text.DecimalFormat; -import org.eclipse.linuxtools.lttng.ui.views.distribution.model.BaseDistributionData; -import org.eclipse.linuxtools.lttng.ui.views.histogram.HistogramUtils; import org.eclipse.linuxtools.lttng.ui.views.latency.AbstractViewer; import org.eclipse.linuxtools.lttng.ui.views.latency.GraphViewer; import org.eclipse.linuxtools.lttng.ui.views.latency.model.Config; import org.eclipse.linuxtools.lttng.ui.views.latency.model.GraphScaledData; import org.eclipse.linuxtools.lttng.ui.views.latency.model.IGraphDataModel; +import org.eclipse.linuxtools.tmf.ui.views.distribution.model.BaseDistributionData; +import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramUtils; /** * GraphPaintListener diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/HistogramPaintListener.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/HistogramPaintListener.java index 0241f647cc..ee923aa366 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/HistogramPaintListener.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/HistogramPaintListener.java @@ -17,12 +17,12 @@ import java.text.DecimalFormat; import java.util.Collections; import java.util.Vector; -import org.eclipse.linuxtools.lttng.ui.views.histogram.HistogramScaledData; -import org.eclipse.linuxtools.lttng.ui.views.histogram.HistogramUtils; -import org.eclipse.linuxtools.lttng.ui.views.histogram.IHistogramDataModel; import org.eclipse.linuxtools.lttng.ui.views.latency.AbstractViewer; import org.eclipse.linuxtools.lttng.ui.views.latency.HistogramViewer; import org.eclipse.linuxtools.lttng.ui.views.latency.Messages; +import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramScaledData; +import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramUtils; +import org.eclipse.linuxtools.tmf.ui.views.histogram.IHistogramDataModel; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Display; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/GraphScaledData.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/GraphScaledData.java index d41e684eaf..387ce9562c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/GraphScaledData.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/GraphScaledData.java @@ -18,7 +18,7 @@ package org.eclipse.linuxtools.lttng.ui.views.latency.model; */ import java.util.Arrays; -import org.eclipse.linuxtools.lttng.ui.views.distribution.model.BaseDistributionData; +import org.eclipse.linuxtools.tmf.ui.views.distribution.model.BaseDistributionData; public class GraphScaledData { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/IGraphDataModel.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/IGraphDataModel.java index 182004bbb5..5d42be997f 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/IGraphDataModel.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/IGraphDataModel.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.linuxtools.lttng.ui.views.latency.model; -import org.eclipse.linuxtools.lttng.ui.views.distribution.model.IBaseDistributionModel; +import org.eclipse.linuxtools.tmf.ui.views.distribution.model.IBaseDistributionModel; /** * IGraphDataModel diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/LatencyController.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/LatencyController.java index fa212d3fc1..6359b37c10 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/LatencyController.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/LatencyController.java @@ -13,12 +13,12 @@ package org.eclipse.linuxtools.lttng.ui.views.latency.model; import org.eclipse.core.runtime.ListenerList; -import org.eclipse.linuxtools.lttng.ui.views.distribution.model.IBaseDistributionModel; -import org.eclipse.linuxtools.lttng.ui.views.histogram.IHistogramDataModel; import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.ui.views.distribution.model.IBaseDistributionModel; +import org.eclipse.linuxtools.tmf.ui.views.histogram.IHistogramDataModel; /** * LatencyController diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/AllTmfUITests.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/AllTmfUITests.java index 4badb73315..8891de4f4e 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/AllTmfUITests.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/AllTmfUITests.java @@ -31,6 +31,7 @@ public class AllTmfUITests { suite.addTest(org.eclipse.linuxtools.tmf.ui.tests.views.uml2sd.handlers.widgets.AllTests.suite()); suite.addTest(org.eclipse.linuxtools.tmf.ui.tests.views.uml2sd.impl.AllTests.suite()); suite.addTest(org.eclipse.linuxtools.tmf.ui.tests.views.uml2sd.load.AllTests.suite()); + suite.addTest(org.eclipse.linuxtools.tmf.ui.tests.histogram.AllTests.suite()); //$JUnit-END$ return suite; } diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/histogram/AllTests.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/histogram/AllTests.java similarity index 93% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/histogram/AllTests.java rename to org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/histogram/AllTests.java index b68a94585f..9bd60ea689 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/histogram/AllTests.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/histogram/AllTests.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.histogram; +package org.eclipse.linuxtools.tmf.ui.tests.histogram; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/histogram/HistogramDataModelTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/histogram/HistogramDataModelTest.java similarity index 98% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/histogram/HistogramDataModelTest.java rename to org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/histogram/HistogramDataModelTest.java index 249d34d2ef..e447dc49f2 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/histogram/HistogramDataModelTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/histogram/HistogramDataModelTest.java @@ -11,13 +11,13 @@ * Bernd Hufmann - Adapt to junit.framework.TestCase *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.histogram; +package org.eclipse.linuxtools.tmf.ui.tests.histogram; import junit.framework.TestCase; -import org.eclipse.linuxtools.lttng.ui.views.histogram.HistogramDataModel; -import org.eclipse.linuxtools.lttng.ui.views.histogram.HistogramScaledData; -import org.eclipse.linuxtools.lttng.ui.views.histogram.IHistogramModelListener; +import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramDataModel; +import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramScaledData; +import org.eclipse.linuxtools.tmf.ui.views.histogram.IHistogramModelListener; /** * HistogramDataModelTest diff --git a/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF index 89dcefe7e5..f25b443bb6 100644 --- a/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF @@ -31,9 +31,11 @@ Export-Package: org.eclipse.linuxtools.tmf.ui, org.eclipse.linuxtools.tmf.ui.views.colors, org.eclipse.linuxtools.tmf.ui.views.events, org.eclipse.linuxtools.tmf.ui.views.filter, + org.eclipse.linuxtools.tmf.ui.views.histogram, org.eclipse.linuxtools.tmf.ui.views.statistics, org.eclipse.linuxtools.tmf.ui.views.statistics.model, org.eclipse.linuxtools.tmf.ui.views.timechart, + org.eclipse.linuxtools.tmf.ui.views.distribution.model, org.eclipse.linuxtools.tmf.ui.views.uml2sd, org.eclipse.linuxtools.tmf.ui.views.uml2sd.core, org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings, diff --git a/org.eclipse.linuxtools.lttng.ui/icons/eview16/histogram.gif b/org.eclipse.linuxtools.tmf.ui/icons/eview16/histogram.gif similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/icons/eview16/histogram.gif rename to org.eclipse.linuxtools.tmf.ui/icons/eview16/histogram.gif diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.properties b/org.eclipse.linuxtools.tmf.ui/plugin.properties index 97245dcbcf..caf71c676b 100644 --- a/org.eclipse.linuxtools.tmf.ui/plugin.properties +++ b/org.eclipse.linuxtools.tmf.ui/plugin.properties @@ -14,6 +14,7 @@ statistics.view.name = Tmf Statistics events.editor.name = Events Editor eventsview.editor.name = Events View uml2sd.view.name = Sequence Diagram +histogram.view.name = Histogram wizard.category.name = Tracing project.new.wizard.name = Tracing Project diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.xml b/org.eclipse.linuxtools.tmf.ui/plugin.xml index 4d3b03f823..5e7210d38b 100644 --- a/org.eclipse.linuxtools.tmf.ui/plugin.xml +++ b/org.eclipse.linuxtools.tmf.ui/plugin.xml @@ -70,6 +70,15 @@ name="%statistics.view.name" restorable="true"> + + diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/BaseDistributionData.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/distribution/model/BaseDistributionData.java similarity index 96% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/BaseDistributionData.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/distribution/model/BaseDistributionData.java index ef3ee33f92..8a25b58a5b 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/BaseDistributionData.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/distribution/model/BaseDistributionData.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Ericsson + * Copyright (c) 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -8,9 +8,10 @@ * * Contributors: * Bernd Hufmann - Initial API and implementation + * Francois Chouinard - Moved from LTTng to TMF ******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.distribution.model; +package org.eclipse.linuxtools.tmf.ui.views.distribution.model; /** * BaseDistributionData @@ -21,6 +22,7 @@ public class BaseDistributionData { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + public final static int OUT_OF_RANGE_BUCKET = -1; /** @@ -56,6 +58,7 @@ public class BaseDistributionData { // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + public BaseDistributionData(int nbBuckets) { fNbBuckets = nbBuckets; clear(); @@ -132,6 +135,7 @@ public class BaseDistributionData { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ + public void clear() { fFirstBucketTime = 0; fFirstEventTime = 0; @@ -139,4 +143,5 @@ public class BaseDistributionData { fLastBucket = 0; fBucketDuration = 1; // 1ns } + } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/IBaseDistributionModel.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/distribution/model/IBaseDistributionModel.java similarity index 82% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/IBaseDistributionModel.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/distribution/model/IBaseDistributionModel.java index 5c61a9eee2..19ff066306 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/IBaseDistributionModel.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/distribution/model/IBaseDistributionModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Ericsson + * Copyright (c) 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -8,9 +8,10 @@ * * Contributors: * Bernd Hufmann - Initial API and implementation + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.distribution.model; +package org.eclipse.linuxtools.tmf.ui.views.distribution.model; public interface IBaseDistributionModel { /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/FullTraceHistogram.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/FullTraceHistogram.java similarity index 97% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/FullTraceHistogram.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/FullTraceHistogram.java index 176cf8db6b..c8f915aee2 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/FullTraceHistogram.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/FullTraceHistogram.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Ericsson + * Copyright (c) 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -9,9 +9,10 @@ * Contributors: * Francois Chouinard - Initial API and implementation * Bernd Hufmann - Changed to updated histogram data model + * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; +package org.eclipse.linuxtools.tmf.ui.views.histogram; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseEvent; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/Histogram.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Histogram.java similarity index 99% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/Histogram.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Histogram.java index 562fdcfc72..97fb54a484 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/Histogram.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Histogram.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Ericsson + * Copyright (c) 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -9,9 +9,10 @@ * Contributors: * Francois Chouinard - Initial API and implementation * Bernd Hufmann - Changed to updated histogram data model + * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; +package org.eclipse.linuxtools.tmf.ui.views.histogram; import org.eclipse.linuxtools.tmf.ui.views.TmfView; import org.eclipse.swt.SWT; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramCurrentTimeControl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramCurrentTimeControl.java similarity index 92% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramCurrentTimeControl.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramCurrentTimeControl.java index bbdd3f135a..0a1dd9bbb7 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramCurrentTimeControl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramCurrentTimeControl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Ericsson + * Copyright (c) 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -8,9 +8,10 @@ * * Contributors: * Francois Chouinard - Initial API and implementation + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; +package org.eclipse.linuxtools.tmf.ui.views.histogram; import org.eclipse.swt.widgets.Composite; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramDataModel.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramDataModel.java similarity index 94% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramDataModel.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramDataModel.java index 28b944ecca..31b9065a0d 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramDataModel.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramDataModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Ericsson + * Copyright (c) 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -8,17 +8,16 @@ * * Contributors: * Francois Chouinard - Initial API and implementation - * Bernd Hufmann - Implementation of new interfaces /listeners and support for + * Bernd Hufmann - Implementation of new interfaces/listeners and support for * time stamp in any order + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; +package org.eclipse.linuxtools.tmf.ui.views.histogram; import java.util.Arrays; import org.eclipse.core.runtime.ListenerList; -import org.eclipse.linuxtools.lttng.core.exceptions.EventOutOfSequenceException; -import org.eclipse.linuxtools.lttng.ui.LTTngUILogger; /** * HistogramDataModel @@ -74,9 +73,6 @@ public class HistogramDataModel implements IHistogramDataModel { public static final int REFRESH_FREQUENCY = DEFAULT_NUMBER_OF_BUCKETS; -// // The ratio where an eccentric value will be truncated -// private static final int MAX_TO_AVERAGE_CUTOFF_RATIO = 5; - // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ @@ -95,9 +91,13 @@ public class HistogramDataModel implements IHistogramDataModel { private long fCurrentEventTime; private long fTimeLimit; - // private listener lists + // Private listener lists private final ListenerList fModelListeners; + // ------------------------------------------------------------------------ + // Constructors + // ------------------------------------------------------------------------ + public HistogramDataModel() { this(DEFAULT_NUMBER_OF_BUCKETS); } @@ -192,6 +192,7 @@ public class HistogramDataModel implements IHistogramDataModel { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ + @Override public void complete() { fireModelUpdateNotification(); @@ -242,9 +243,6 @@ public class HistogramDataModel implements IHistogramDataModel { // Validate if (timestamp < 0) { - String message = "Negative time value"; //$NON-NLS-1$ - EventOutOfSequenceException exception = new EventOutOfSequenceException(message); - LTTngUILogger.logError(message, exception); return; } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java similarity index 83% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java index 578b91c21f..5707fa51a6 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Ericsson + * Copyright (c) 2009, 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -10,21 +10,22 @@ * William Bourque - Initial API and implementation * Yuriy Vashchuk - Heritage correction. * Francois Chouinard - Cleanup and refactoring + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; +package org.eclipse.linuxtools.tmf.ui.views.histogram; -import org.eclipse.linuxtools.lttng.core.LttngConstants; -import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; /** * HistogramRequest *

*/ -public class HistogramRequest extends TmfEventRequest { +public class HistogramRequest extends TmfEventRequest { // ------------------------------------------------------------------------ // Attributes @@ -37,7 +38,7 @@ public class HistogramRequest extends TmfEventRequest { // ------------------------------------------------------------------------ public HistogramRequest(HistogramDataModel histogram, TmfTimeRange range, int rank, int nbEvents, ITmfDataRequest.ExecutionType execType) { - super(LttngEvent.class, range, rank, nbEvents, LttngConstants.DEFAULT_BLOCK_SIZE, execType); + super(ITmfEvent.class, range, rank, nbEvents, TmfTrace.DEFAULT_INDEX_PAGE_SIZE, execType); fHistogram = histogram; } @@ -54,7 +55,7 @@ public class HistogramRequest extends TmfEventRequest { // ------------------------------------------------------------------------ @Override - public void handleData(LttngEvent event) { + public void handleData(ITmfEvent event) { super.handleData(event); if (event != null) { long timestamp = event.getTimestamp().getValue(); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramScaledData.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramScaledData.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramScaledData.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramScaledData.java index b1e6a1fe5e..648d7c8e38 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramScaledData.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramScaledData.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Ericsson + * Copyright (c) 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -9,9 +9,10 @@ * Contributors: * Francois Chouinard - Initial API and implementation * Bernd Hufmann - Added setter and getter + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; +package org.eclipse.linuxtools.tmf.ui.views.histogram; import java.util.Arrays; @@ -78,6 +79,7 @@ public class HistogramScaledData { // ------------------------------------------------------------------------ // Setter and Getter // ------------------------------------------------------------------------ + public long getFirstBucketTime() { return fFirstBucketTime; } @@ -97,4 +99,5 @@ public class HistogramScaledData { public long getBucketEndTime(int index) { return getBucketStartTime(index) + fBucketDuration; } + } \ No newline at end of file diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramTextControl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTextControl.java similarity index 97% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramTextControl.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTextControl.java index 009fa29f3f..104bd0074a 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramTextControl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTextControl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Ericsson + * Copyright (c) 2009, 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -9,9 +9,10 @@ * Contributors: * Wiliam Bourque - Adapted from SpinnerGroup (in TimeFrameView) * Francois Chouinard - Cleanup and refactoring + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; +package org.eclipse.linuxtools.tmf.ui.views.histogram; import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusEvent; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramTimeRangeControl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTimeRangeControl.java similarity index 92% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramTimeRangeControl.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTimeRangeControl.java index b12c25df88..2d221921a7 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramTimeRangeControl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTimeRangeControl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Ericsson + * Copyright (c) 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -8,9 +8,10 @@ * * Contributors: * Francois Chouinard - Initial API and implementation + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; +package org.eclipse.linuxtools.tmf.ui.views.histogram; import org.eclipse.swt.widgets.Composite; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramUtils.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramUtils.java similarity index 96% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramUtils.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramUtils.java index a5b9d53dea..552dab3f45 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramUtils.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Ericsson + * Copyright (c) 2009, 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -9,9 +9,10 @@ * Contributors: * William Bourque - Initial API and implementation * Francois Chouinard - Cleanup and refactoring + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; +package org.eclipse.linuxtools.tmf.ui.views.histogram; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.widgets.Composite; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java index 0fe3ec75ca..346399e4a6 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010, 2011 Ericsson + * Copyright (c) 2009, 2010, 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -12,11 +12,12 @@ * Yuriy Vashchuk - Histograms optimisation. * Yuriy Vashchuk - Histogram Canvas Heritage correction * Francois Chouinard - Cleanup and refactoring + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; +package org.eclipse.linuxtools.tmf.ui.views.histogram; -import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @@ -55,7 +56,7 @@ public class HistogramView extends TmfView { // ------------------------------------------------------------------------ // The view ID as defined in plugin.xml - public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.histogram"; //$NON-NLS-1$ + public static final String ID = "org.eclipse.linuxtools.tmf.ui.views.histogram"; //$NON-NLS-1$ // The initial window span (in nanoseconds) public static final long INITIAL_WINDOW_SPAN = (1L * 100 * 1000 * 1000); // .1sec @@ -71,7 +72,7 @@ public class HistogramView extends TmfView { private Composite fParent; // The current experiment - private TmfExperiment fCurrentExperiment; + private TmfExperiment fCurrentExperiment; // Current timestamp/time window private long fExperimentStartTime; @@ -234,7 +235,7 @@ public class HistogramView extends TmfView { fFullTraceHistogram = new FullTraceHistogram(this, fullRangeComposite); // Load the experiment if present - fCurrentExperiment = (TmfExperiment) TmfExperiment.getCurrentExperiment(); + fCurrentExperiment = (TmfExperiment) TmfExperiment.getCurrentExperiment(); if (fCurrentExperiment != null) loadExperiment(); } @@ -242,7 +243,7 @@ public class HistogramView extends TmfView { @Override @SuppressWarnings("unchecked") public void setFocus() { - TmfExperiment experiment = (TmfExperiment) TmfExperiment.getCurrentExperiment(); + TmfExperiment experiment = (TmfExperiment) TmfExperiment.getCurrentExperiment(); if ((experiment != null) && (experiment != fCurrentExperiment)) { fCurrentExperiment = experiment; initializeHistograms(); @@ -268,7 +269,7 @@ public class HistogramView extends TmfView { TmfTimeRange timeRange = new TmfTimeRange(new TmfTimestamp(newTime, TIME_SCALE), TmfTimestamp.BigCrunch); HistogramRequest request = new HistogramRequest(fTimeRangeHistogram.getDataModel(), timeRange, 0, 1, ExecutionType.FOREGROUND) { @Override - public void handleData(LttngEvent event) { + public void handleData(ITmfEvent event) { if (event != null) { TmfTimeSynchSignal signal = new TmfTimeSynchSignal(this, event.getTimestamp()); TmfSignalManager.dispatchSignal(signal); @@ -324,9 +325,9 @@ public class HistogramView extends TmfView { @TmfSignalHandler @SuppressWarnings("unchecked") - public void experimentSelected(TmfExperimentSelectedSignal signal) { + public void experimentSelected(TmfExperimentSelectedSignal signal) { assert (signal != null); - fCurrentExperiment = (TmfExperiment) signal.getExperiment(); + fCurrentExperiment = (TmfExperiment) signal.getExperiment(); loadExperiment(); } @@ -423,7 +424,7 @@ public class HistogramView extends TmfView { sendFullRangeRequest(fullRange); } - private TmfTimeRange updateExperimentTimeRange(TmfExperiment experiment) { + private TmfTimeRange updateExperimentTimeRange(TmfExperiment experiment) { fExperimentStartTime = 0; fExperimentEndTime = 0; fCurrentTimestamp = 0; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramZoom.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramZoom.java similarity index 97% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramZoom.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramZoom.java index f632726996..a928b6b592 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramZoom.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramZoom.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Ericsson + * Copyright (c) 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -8,9 +8,10 @@ * * Contributors: * Francois Chouinard - Initial API and implementation + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; +package org.eclipse.linuxtools.tmf.ui.views.histogram; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseWheelListener; @@ -19,7 +20,6 @@ import org.eclipse.swt.widgets.Canvas; /** * HistogramZoom *

- * TODO: Document me... */ public class HistogramZoom implements MouseWheelListener { @@ -46,7 +46,7 @@ public class HistogramZoom implements MouseWheelListener { private MouseScrollCounter fScrollCounter; // ------------------------------------------------------------------------ - // Construction + // Constructors // ------------------------------------------------------------------------ public HistogramZoom(Histogram histogram, Canvas canvas, long start, long end) { @@ -183,7 +183,7 @@ public class HistogramZoom implements MouseWheelListener { private int nbScrollClick = 0; // -------------------------------------------------------------------- - // Construction + // Constructors // -------------------------------------------------------------------- public MouseScrollCounter(HistogramZoom zoom) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/IHistogramDataModel.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/IHistogramDataModel.java similarity index 84% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/IHistogramDataModel.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/IHistogramDataModel.java index 35606f3351..b61d7c24bf 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/IHistogramDataModel.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/IHistogramDataModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Ericsson + * Copyright (c) 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -8,14 +8,17 @@ * * Contributors: * Bernd Hufmann - Initial API and implementation + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; + +package org.eclipse.linuxtools.tmf.ui.views.histogram; + +import org.eclipse.linuxtools.tmf.ui.views.distribution.model.IBaseDistributionModel; /** * IHistogramDataModel *

*/ -import org.eclipse.linuxtools.lttng.ui.views.distribution.model.IBaseDistributionModel; public interface IHistogramDataModel extends IBaseDistributionModel { /** @@ -35,4 +38,5 @@ public interface IHistogramDataModel extends IBaseDistributionModel { * doesn't exceed [height] considering the bar width [barWidth] */ public HistogramScaledData scaleTo(int width, int height, int barWidth); + } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/IHistogramModelListener.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/IHistogramModelListener.java similarity index 82% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/IHistogramModelListener.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/IHistogramModelListener.java index d980a17ccb..2dfd3f21d4 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/IHistogramModelListener.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/IHistogramModelListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Ericsson + * Copyright (c) 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -8,8 +8,10 @@ * * Contributors: * Bernd Hufmann - Initial API and implementation + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; + +package org.eclipse.linuxtools.tmf.ui.views.histogram; /** * IHistogramModelListener diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Messages.java similarity index 88% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/Messages.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Messages.java index 719ef6299a..0b067a6d0f 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/Messages.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Messages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Ericsson + * Copyright (c) 2009, 2011, 2012 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -9,9 +9,10 @@ * Contributors: * William Bourque - Initial API and implementation * Francois Chouinard - Cleanup and refactoring + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; +package org.eclipse.linuxtools.tmf.ui.views.histogram; import org.eclipse.osgi.util.NLS; @@ -25,7 +26,7 @@ public class Messages extends NLS { // Constants // ------------------------------------------------------------------------ - private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.histogram.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.ui.views.histogram.messages"; //$NON-NLS-1$ public static String HistogramView_currentEventLabel; public static String HistogramView_windowSpanLabel; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/TimeRangeHistogram.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java similarity index 92% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/TimeRangeHistogram.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java index 85a00612e4..bf8e2030fb 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/TimeRangeHistogram.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java @@ -1,6 +1,6 @@ /******************************************************************************* + * Copyright (c) 2011, 2012 Ericsson * - * Copyright (c) 2011 Ericsson * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at @@ -9,9 +9,10 @@ * Contributors: * Francois Chouinard - Initial API and implementation * Bernd Hufmann - Changed to updated histogram data model + * Francois Chouinard - Moved from LTTng to TMF *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.views.histogram; +package org.eclipse.linuxtools.tmf.ui.views.histogram; import org.eclipse.swt.widgets.Composite; @@ -30,7 +31,7 @@ public class TimeRangeHistogram extends Histogram { // Attributes // ------------------------------------------------------------------------ - HistogramZoom fZoom; + HistogramZoom fZoom = null; // ------------------------------------------------------------------------ // Constructor diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/messages.properties b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/messages.properties similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/messages.properties rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/messages.properties -- 2.34.1