From c3ef67f7125f08166e3514ca8050cd30e8bd48db Mon Sep 17 00:00:00 2001 From: Bernd Hufmann Date: Wed, 11 May 2022 15:54:01 -0400 Subject: [PATCH] Bug 579875: Set the ScriptedXYView title to the DP name Change-Id: I30cc11001f92c879de58e150bb98237b1870adcc Signed-off-by: Bernd Hufmann Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/193302 Tested-by: Trace Compass Bot Tested-by: Matthew Khouzam Reviewed-by: Matthew Khouzam --- .../data/provider/DataProviderScriptingModule.java | 3 +-- .../scripting/ui/views/xychart/ScriptedXYView.java | 13 ++++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/data/provider/DataProviderScriptingModule.java b/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/data/provider/DataProviderScriptingModule.java index b569b75d..19f2bade 100644 --- a/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/data/provider/DataProviderScriptingModule.java +++ b/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/data/provider/DataProviderScriptingModule.java @@ -35,7 +35,6 @@ import org.eclipse.tracecompass.statesystem.core.statevalue.ITmfStateValue; import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule; import org.eclipse.tracecompass.tmf.core.analysis.TmfAbstractAnalysisModule; -import org.eclipse.tracecompass.tmf.core.component.DataProviderConstants; import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphArrow; import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphDataProvider; import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphEntryModel; @@ -369,7 +368,7 @@ public class DataProviderScriptingModule { DataDrivenOutputEntry entry = new DataDrivenOutputEntry(Collections.emptyList(), path, null, true, display, id, parent, name, displayType); - ITmfTreeXYDataProvider provider = DataDrivenXYProviderFactory.create(trace, stateSystems, Collections.singletonList(entry), ScriptingDataProviderManager.PROVIDER_ID + DataProviderConstants.ID_SEPARATOR + analysisName); + ITmfTreeXYDataProvider provider = DataDrivenXYProviderFactory.create(trace, stateSystems, Collections.singletonList(entry), ScriptingDataProviderManager.createProviderId(analysisName)); ScriptingDataProviderManager.getInstance().registerDataProvider(trace, provider); return provider; } diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/views/xychart/ScriptedXYView.java b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/views/xychart/ScriptedXYView.java index 9cc55c36..980178ab 100644 --- a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/views/xychart/ScriptedXYView.java +++ b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/views/xychart/ScriptedXYView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 École Polytechnique de Montréal + * Copyright (c) 2019, 2022 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License 2.0 which @@ -16,6 +16,8 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.swt.widgets.Composite; +import org.eclipse.tracecompass.common.core.NonNullUtils; +import org.eclipse.tracecompass.incubator.internal.scripting.core.data.provider.ScriptingDataProviderManager; import org.eclipse.tracecompass.tmf.core.component.DataProviderConstants; import org.eclipse.tracecompass.tmf.ui.viewers.TmfViewer; import org.eclipse.tracecompass.tmf.ui.viewers.xychart.TmfXYChartViewer; @@ -48,6 +50,15 @@ public ScriptedXYView() { super(Messages.ScriptedXYTreeViewer_DefaultTitle); } + @Override + public void createPartControl(Composite parent) { + super.createPartControl(parent); + String title = ScriptingDataProviderManager.extractProviderName(NonNullUtils.nullToEmptyString(getSecondaryIdName())); + if (title != null) { + setPartName(title); + } + } + @Override protected TmfXYChartViewer createChartViewer(Composite parent) { TmfXYChartSettings settings = new TmfXYChartSettings(Messages.ScriptedXYTreeViewer_DefaultViewerTitle,