Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/plugin.xml14
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statistics/TmfStatisticsModule.java (renamed from lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsModule.java)10
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/plugin.xml21
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/TmfStatisticsViewer.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tracing.examples/src/org/eclipse/linuxtools/tracing/examples/ui/viewers/histogram/NewHistogramViewer.java2
5 files changed, 25 insertions, 24 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/plugin.xml b/lttng/org.eclipse.linuxtools.tmf.core/plugin.xml
index 960af79353..d615cd4fff 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core/plugin.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.core/plugin.xml
@@ -15,6 +15,20 @@
<source
class="org.eclipse.linuxtools.internal.tmf.core.analysis.TmfAnalysisModuleSourceConfigElement">
</source>
+ <module
+ analysis_module="org.eclipse.linuxtools.tmf.core.statistics.TmfStatisticsModule"
+ automatic="true"
+ id="org.eclipse.linuxtools.tmf.core.statistics.analysis"
+ name="Tmf Statistics Analysis">
+ <tracetype
+ applies="true"
+ class="org.eclipse.linuxtools.tmf.core.trace.TmfTrace">
+ </tracetype>
+ <tracetype
+ applies="false"
+ class="org.eclipse.linuxtools.tmf.core.trace.TmfExperiment">
+ </tracetype>
+ </module>
</extension>
<extension
point="org.eclipse.linuxtools.tmf.core.tracetype">
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsModule.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statistics/TmfStatisticsModule.java
index fd38031e0d..d73c72a242 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsModule.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statistics/TmfStatisticsModule.java
@@ -10,7 +10,7 @@
* Alexandre Montplaisir - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.ui.views.statistics;
+package org.eclipse.linuxtools.tmf.core.statistics;
import java.util.LinkedList;
import java.util.List;
@@ -24,12 +24,7 @@ import org.eclipse.linuxtools.tmf.core.exceptions.TmfAnalysisException;
import org.eclipse.linuxtools.tmf.core.statesystem.ITmfAnalysisModuleWithStateSystems;
import org.eclipse.linuxtools.tmf.core.statesystem.ITmfStateSystem;
import org.eclipse.linuxtools.tmf.core.statesystem.TmfStateSystemAnalysisModule;
-import org.eclipse.linuxtools.tmf.core.statistics.ITmfStatistics;
-import org.eclipse.linuxtools.tmf.core.statistics.TmfStateStatistics;
-import org.eclipse.linuxtools.tmf.core.statistics.TmfStatisticsEventTypesModule;
-import org.eclipse.linuxtools.tmf.core.statistics.TmfStatisticsTotalsModule;
import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.ui.analysis.TmfAnalysisViewOutput;
/**
* Analysis module to compute the statistics of a trace.
@@ -41,7 +36,7 @@ public class TmfStatisticsModule extends TmfAbstractAnalysisModule
implements ITmfAnalysisModuleWithStateSystems {
/** ID of this analysis module */
- public static final String ID = "org.eclipse.linuxtools.tmf.ui.views.statistics.analysis"; //$NON-NLS-1$
+ public static final String ID = "org.eclipse.linuxtools.tmf.core.statistics.analysis"; //$NON-NLS-1$
/** The trace's statistics */
private ITmfStatistics fStatistics = null;
@@ -56,7 +51,6 @@ public class TmfStatisticsModule extends TmfAbstractAnalysisModule
*/
public TmfStatisticsModule() {
super();
- this.registerOutput(new TmfAnalysisViewOutput(TmfStatisticsView.ID));
}
/**
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/plugin.xml b/lttng/org.eclipse.linuxtools.tmf.ui/plugin.xml
index ed62963d7c..119166af6e 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/plugin.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/plugin.xml
@@ -1669,20 +1669,13 @@
</extension>
<extension
point="org.eclipse.linuxtools.tmf.core.analysis">
- <module
- analysis_module="org.eclipse.linuxtools.tmf.ui.views.statistics.TmfStatisticsModule"
- automatic="true"
- id="org.eclipse.linuxtools.tmf.ui.views.statistics.analysis"
- name="Tmf Statistics Analysis">
- <tracetype
- applies="true"
- class="org.eclipse.linuxtools.tmf.core.trace.TmfTrace">
- </tracetype>
- <tracetype
- applies="false"
- class="org.eclipse.linuxtools.tmf.core.trace.TmfExperiment">
- </tracetype>
- </module>
+ <output
+ class="org.eclipse.linuxtools.tmf.ui.analysis.TmfAnalysisViewOutput"
+ id="org.eclipse.linuxtools.tmf.ui.views.statistics">
+ <analysisId
+ id="org.eclipse.linuxtools.tmf.core.statistics.analysis">
+ </analysisId>
+ </output>
</extension>
<extension
point="org.eclipse.linuxtools.tmf.ui.tracetypeui">
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/TmfStatisticsViewer.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/TmfStatisticsViewer.java
index e84b896abb..9401e338f7 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/TmfStatisticsViewer.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/TmfStatisticsViewer.java
@@ -29,6 +29,7 @@ import org.eclipse.linuxtools.tmf.core.signal.TmfTraceRangeUpdatedSignal;
import org.eclipse.linuxtools.tmf.core.statesystem.ITmfStateSystem;
import org.eclipse.linuxtools.tmf.core.statistics.ITmfStatistics;
import org.eclipse.linuxtools.tmf.core.statistics.TmfStatisticsEventTypesModule;
+import org.eclipse.linuxtools.tmf.core.statistics.TmfStatisticsModule;
import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp;
import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange;
import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
@@ -42,7 +43,6 @@ import org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.TmfStatisticsTree;
import org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.TmfStatisticsTreeManager;
import org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.TmfStatisticsTreeNode;
import org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.TmfTreeContentProvider;
-import org.eclipse.linuxtools.tmf.ui.views.statistics.TmfStatisticsModule;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
diff --git a/lttng/org.eclipse.linuxtools.tracing.examples/src/org/eclipse/linuxtools/tracing/examples/ui/viewers/histogram/NewHistogramViewer.java b/lttng/org.eclipse.linuxtools.tracing.examples/src/org/eclipse/linuxtools/tracing/examples/ui/viewers/histogram/NewHistogramViewer.java
index c6a6fa1360..ee3369c815 100644
--- a/lttng/org.eclipse.linuxtools.tracing.examples/src/org/eclipse/linuxtools/tracing/examples/ui/viewers/histogram/NewHistogramViewer.java
+++ b/lttng/org.eclipse.linuxtools.tracing.examples/src/org/eclipse/linuxtools/tracing/examples/ui/viewers/histogram/NewHistogramViewer.java
@@ -16,10 +16,10 @@ import java.util.Arrays;
import java.util.List;
import org.eclipse.linuxtools.tmf.core.statistics.ITmfStatistics;
+import org.eclipse.linuxtools.tmf.core.statistics.TmfStatisticsModule;
import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
import org.eclipse.linuxtools.tmf.core.trace.TmfTraceManager;
import org.eclipse.linuxtools.tmf.ui.viewers.xycharts.barcharts.TmfBarChartViewer;
-import org.eclipse.linuxtools.tmf.ui.views.statistics.TmfStatisticsModule;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;

Back to the top