Skip to content

Commit

Permalink
Bug 578957: Return correct composite DP in FlameChartDataProviderFactory
Browse files Browse the repository at this point in the history
Return TmfTimeGraphCompositeDataProvider instead of
TmfTreeXYCompositeDataProvider for a TmfExperiment.

Change-Id: I26dee568d6e6d2597fa2bb458d8306162f706b99
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/191558
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
  • Loading branch information
bhufmann committed Mar 8, 2022
1 parent 471da75 commit 937da3d
Showing 1 changed file with 3 additions and 3 deletions.
Expand Up @@ -23,12 +23,12 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.tracecompass.incubator.callstack.core.instrumented.IFlameChartProvider;
import org.eclipse.tracecompass.internal.tmf.core.model.DataProviderDescriptor;
import org.eclipse.tracecompass.internal.tmf.core.model.xy.TmfTreeXYCompositeDataProvider;
import org.eclipse.tracecompass.internal.tmf.core.model.timegraph.TmfTimeGraphCompositeDataProvider;
import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
import org.eclipse.tracecompass.tmf.core.component.DataProviderConstants;
import org.eclipse.tracecompass.tmf.core.dataprovider.IDataProviderDescriptor;
import org.eclipse.tracecompass.tmf.core.dataprovider.IDataProviderFactory;
import org.eclipse.tracecompass.tmf.core.dataprovider.IDataProviderDescriptor.ProviderType;
import org.eclipse.tracecompass.tmf.core.dataprovider.IDataProviderFactory;
import org.eclipse.tracecompass.tmf.core.model.tree.ITmfTreeDataModel;
import org.eclipse.tracecompass.tmf.core.model.tree.ITmfTreeDataProvider;
import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
Expand Down Expand Up @@ -63,7 +63,7 @@ public class FlameChartDataProviderFactory implements IDataProviderFactory {
if (traces.size() > 1) {
// Try creating a composite only if there are many traces, otherwise, the
// previous call to create should have returned the data provider
return TmfTreeXYCompositeDataProvider.create(traces, Objects.requireNonNull(Messages.FlameChartDataProvider_Title), FlameChartDataProvider.ID, secondaryId);
return TmfTimeGraphCompositeDataProvider.create(traces, FlameChartDataProvider.ID, secondaryId);
}
return null;

Expand Down

0 comments on commit 937da3d

Please sign in to comment.