From 0feae9f890502d8033d11867e9f3f00cef85bdcf Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Wed, 6 Jul 2016 16:38:24 -0400 Subject: [PATCH] lttng.ust: Use correct Activator in MemoryUsageViewer It was importing tmf.core's Activator! :O Change-Id: I9b7edce8c59f9638292bf20b2f3ecc4253b8c4c4 Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/76783 Reviewed-by: Hudson CI --- .../lttng2/ust/ui/views/memusage/MemoryUsageViewer.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java b/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java index 80eee6a91c..72e186ada7 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java +++ b/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java @@ -24,7 +24,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.tracecompass.common.core.format.DataSizeWithUnitFormat; import org.eclipse.tracecompass.internal.lttng2.ust.core.analysis.memory.UstMemoryStrings; -import org.eclipse.tracecompass.internal.tmf.core.Activator; +import org.eclipse.tracecompass.internal.lttng2.ust.ui.Activator; import org.eclipse.tracecompass.lttng2.ust.core.analysis.memory.UstMemoryAnalysisModule; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; import org.eclipse.tracecompass.statesystem.core.exceptions.AttributeNotFoundException; @@ -44,7 +44,6 @@ import org.swtchart.Chart; * * @author Matthew Khouzam */ -@SuppressWarnings("restriction") public class MemoryUsageViewer extends TmfCommonXLineChartViewer { private TmfStateSystemAnalysisModule fModule = null; @@ -177,7 +176,7 @@ public class MemoryUsageViewer extends TmfCommonXLineChartViewer { updateDisplay(); } } catch (AttributeNotFoundException | StateValueTypeException e) { - Activator.logError("Error updating the data of the Memory usage view", e); //$NON-NLS-1$ + Activator.getDefault().logError("Error updating the data of the Memory usage view", e); //$NON-NLS-1$ } catch (StateSystemDisposedException e) { /* State system is closing down, no point continuing */ } -- 2.34.1