Bug 581856: Remove deprecated DataProviderManager.getDataProvider

Replace it with sibling getOrCreateDataProvider use, as prescribed by the deprecation notice. Deprecated in commit cee48a6, since v8.0.0. [Removed] o.e.t.tmf.core.dataprovider.DataProviderManager.getDataProvider Change-Id: I682e5e49692c1196d66ebd4cbc2bdf65dfb12267 Signed-off-by: Marco Miller <marco.miller@ericsson.com> Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/201595 Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org> Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com> Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
eclipse-tracecompass · Apr 28, 2023 · a4d244e · a4d244e
1 parent 906c6d6
commit a4d244e
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 38 deletions.
diff --git a/...rc/org/eclipse/tracecompass/internal/analysis/callstack/ui/flamegraph/FlameGraphView.java b/...rc/org/eclipse/tracecompass/internal/analysis/callstack/ui/flamegraph/FlameGraphView.java
@@ -148,7 +148,6 @@
  *
  * @author Sonia Farrah
  */
-@SuppressWarnings("deprecation")
 @NonNullByDefault({})
 public class FlameGraphView extends TmfView {
     private static final @NonNull Logger LOGGER = Logger.getLogger(FlameGraphView.class.getName());
@@ -417,7 +416,7 @@ public void run(IProgressMonitor monitor) {
     private void buildEntryList(@NonNull ITmfTrace trace, @NonNull ITmfTrace parentTrace, @NonNull Map<String, Object> additionalParams, @NonNull IProgressMonitor monitor) {
         @SuppressWarnings("unchecked")
         ITimeGraphDataProvider<@NonNull TimeGraphEntryModel> dataProvider = DataProviderManager
-                .getInstance().getDataProvider(trace, getProviderId(), ITimeGraphDataProvider.class);
+                .getInstance().getOrCreateDataProvider(trace, getProviderId(), ITimeGraphDataProvider.class);
         if (dataProvider == null) {
             return;
         }

diff --git a/...ecompass/internal/analysis/os/linux/ui/views/controlflow/filters/ActiveThreadsFilter.java b/...ecompass/internal/analysis/os/linux/ui/views/controlflow/filters/ActiveThreadsFilter.java
@@ -163,7 +163,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 
     private static @NonNull Set<Long> getOnCpuThreads(@NonNull List<Range<Long>> cpuRanges, TmfTimeRange winRange, @NonNull ITmfTrace trace) {
 
-        ThreadStatusDataProvider threadStatusProvider = DataProviderManager.getInstance().getDataProvider(trace,
+        ThreadStatusDataProvider threadStatusProvider = DataProviderManager.getInstance().getOrCreateDataProvider(trace,
                 ThreadStatusDataProvider.ID, ThreadStatusDataProvider.class);
 
         if (threadStatusProvider == null) {
@@ -194,7 +194,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
 
     private static @NonNull Set<Long> getActiveThreads(TmfTimeRange winRange, @NonNull ITmfTrace trace) {
 
-        ThreadStatusDataProvider threadStatusProvider = DataProviderManager.getInstance().getDataProvider(trace,
+        ThreadStatusDataProvider threadStatusProvider = DataProviderManager.getInstance().getOrCreateDataProvider(trace,
                 ThreadStatusDataProvider.ID, ThreadStatusDataProvider.class);
 
         if (threadStatusProvider == null) {

diff --git a/...i/src/org/eclipse/tracecompass/analysis/profiling/ui/views/flamechart/FlameChartView.java b/...i/src/org/eclipse/tracecompass/analysis/profiling/ui/views/flamechart/FlameChartView.java
@@ -428,7 +428,7 @@ protected void rebuild() {
 
     @Override
     protected void buildEntryList(final ITmfTrace trace, final ITmfTrace parentTrace, final IProgressMonitor monitor) {
-        CallStackDataProvider provider = DataProviderManager.getInstance().getDataProvider(trace,
+        CallStackDataProvider provider = DataProviderManager.getInstance().getOrCreateDataProvider(trace,
                 getProviderId(), CallStackDataProvider.class);
         if (provider == null) {
             addUnavailableEntry(trace, parentTrace);

diff --git a/...sis/timing/ui/views/segmentstore/scatter/AbstractSegmentStoreScatterChartTreeViewer2.java b/...sis/timing/ui/views/segmentstore/scatter/AbstractSegmentStoreScatterChartTreeViewer2.java
@@ -124,7 +124,7 @@ protected String getAnalysisId() {
         }
         fSegmentProvider = (ISegmentStoreProvider) module;
         ((ISegmentStoreProvider) module).addListener(fListener);
-        return DataProviderManager.getInstance().getDataProvider(trace, SegmentStoreScatterDataProvider.ID + ':' + analysisId, ITmfTreeXYDataProvider.class);
+        return DataProviderManager.getInstance().getOrCreateDataProvider(trace, SegmentStoreScatterDataProvider.ID + ':' + analysisId, ITmfTreeXYDataProvider.class);
     }
 
     @Override

diff --git a/...nalysis/timing/ui/views/segmentstore/scatter/AbstractSegmentStoreScatterChartViewer2.java b/...nalysis/timing/ui/views/segmentstore/scatter/AbstractSegmentStoreScatterChartViewer2.java
@@ -98,7 +98,7 @@ protected String getAnalysisId() {
              * that get the analysis ID of the segment store, is removed */
             return null;
         }
-        return DataProviderManager.getInstance().getDataProvider(trace, SegmentStoreScatterDataProvider.ID + ':' + analysisId, ITmfTreeXYDataProvider.class);
+        return DataProviderManager.getInstance().getOrCreateDataProvider(trace, SegmentStoreScatterDataProvider.ID + ':' + analysisId, ITmfTreeXYDataProvider.class);
     }
 
     // ------------------------------------------------------------------------

diff --git a/...ss/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentsStatisticsViewer.java b/...ss/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentsStatisticsViewer.java
@@ -237,7 +237,7 @@ public void run() {
         // first try to get the data provider from the data provider manager.
         String providerId = fProviderId;
         if (providerId != null) {
-            provider = DataProviderManager.getInstance().getDataProvider(trace,
+            provider = DataProviderManager.getInstance().getOrCreateDataProvider(trace,
                     fProviderId, ITmfTreeDataProvider.class);
         }
 

diff --git a/...pass.tmf.core/src/org/eclipse/tracecompass/tmf/core/dataprovider/DataProviderManager.java b/...pass.tmf.core/src/org/eclipse/tracecompass/tmf/core/dataprovider/DataProviderManager.java
@@ -114,29 +114,6 @@ private void loadDataProviders() {
         }
     }
 
-    /**
-     * Get or creates the data provider for the given trace.
-     * <p>
-     * This method should never be called from within a {@link TmfSignalHandler}.
-     *
-     * @param trace
-     *            An instance of {@link ITmfTrace}.
-     *            Note, that trace can be an instance of TmfExperiment, too.
-     * @param id
-     *            Id of the data provider. This ID can be the concatenation of a
-     *            provider ID + ':' + a secondary ID used to differentiate multiple
-     *            instances of a same provider.
-     * @param dataProviderClass
-     *            Returned data provider must extend this class
-     * @return the data provider or null if no data provider is found for the input parameter.
-     * @since 4.0
-     * @deprecated use {@link #getOrCreateDataProvider(ITmfTrace, String, Class)} instead
-     */
-    @Deprecated
-    public synchronized @Nullable <T extends ITmfTreeDataProvider<? extends ITmfTreeDataModel>> T getDataProvider(@NonNull ITmfTrace trace, String id, Class<T> dataProviderClass) {
-        return getOrCreateDataProvider(trace, id, dataProviderClass);
-    }
-
     /**
      * Gets or creates the data provider for the given trace.
      * <p>

diff --git a/.../org/eclipse/tracecompass/tmf/core/model/timegraph/TmfTimeGraphCompositeDataProvider.java b/.../org/eclipse/tracecompass/tmf/core/model/timegraph/TmfTimeGraphCompositeDataProvider.java
@@ -97,7 +97,7 @@ public TmfTimeGraphCompositeDataProvider(List<P> providers, String id) {
         String providerId = secondaryId == null ? id : id + ':' + secondaryId;
         List<@NonNull ITimeGraphDataProvider<ITimeGraphEntryModel>> providers = new ArrayList<>();
         for (ITmfTrace child : traces) {
-            ITimeGraphDataProvider<ITimeGraphEntryModel> provider = DataProviderManager.getInstance().getDataProvider(child, providerId, ITimeGraphDataProvider.class);
+            ITimeGraphDataProvider<ITimeGraphEntryModel> provider = DataProviderManager.getInstance().getOrCreateDataProvider(child, providerId, ITimeGraphDataProvider.class);
             if (provider != null) {
                 providers.add(provider);
             }

diff --git a/...f.core/src/org/eclipse/tracecompass/tmf/core/model/tree/TmfTreeCompositeDataProvider.java b/...f.core/src/org/eclipse/tracecompass/tmf/core/model/tree/TmfTreeCompositeDataProvider.java
@@ -74,7 +74,7 @@ public class TmfTreeCompositeDataProvider<M extends ITmfTreeDataModel, P extends
     public static @Nullable ITmfTreeDataProvider<? extends ITmfTreeDataModel> create(Collection<ITmfTrace> traces, String id) {
         List<@NonNull ITmfTreeDataProvider<ITmfTreeDataModel>> providers = new ArrayList<>();
         for (ITmfTrace child : traces) {
-            ITmfTreeDataProvider<ITmfTreeDataModel> provider = DataProviderManager.getInstance().getDataProvider(child, id, ITmfTreeDataProvider.class);
+            ITmfTreeDataProvider<ITmfTreeDataModel> provider = DataProviderManager.getInstance().getOrCreateDataProvider(child, id, ITmfTreeDataProvider.class);
             if (provider != null) {
                 providers.add(provider);
             }

diff --git a/...f.core/src/org/eclipse/tracecompass/tmf/core/model/xy/TmfTreeXYCompositeDataProvider.java b/...f.core/src/org/eclipse/tracecompass/tmf/core/model/xy/TmfTreeXYCompositeDataProvider.java
@@ -106,7 +106,7 @@ public TmfTreeXYCompositeDataProvider(List<P> providers, String title, String id
         String providerId = secondaryId == null ? id : id + ':' + secondaryId;
         List<@NonNull ITmfTreeXYDataProvider<ITmfTreeDataModel>> providers = new ArrayList<>();
         for (ITmfTrace child : traces) {
-            ITmfTreeXYDataProvider<ITmfTreeDataModel> provider = DataProviderManager.getInstance().getDataProvider(child, providerId, ITmfTreeXYDataProvider.class);
+            ITmfTreeXYDataProvider<ITmfTreeDataModel> provider = DataProviderManager.getInstance().getOrCreateDataProvider(child, providerId, ITmfTreeXYDataProvider.class);
             if (provider != null) {
                 providers.add(provider);
             }

diff --git a/...ss.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/tree/AbstractSelectTreeViewer2.java b/...ss.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/tree/AbstractSelectTreeViewer2.java
@@ -636,7 +636,7 @@ protected ITmfTreeViewerEntry updateElements(ITmfTrace trace, long start, long e
      * @since 4.0
      */
     protected ITmfTreeDataProvider<@NonNull ITmfTreeDataModel> getProvider(@NonNull ITmfTrace trace) {
-        return DataProviderManager.getInstance().getDataProvider(trace, fId, ITmfTreeDataProvider.class);
+        return DataProviderManager.getInstance().getOrCreateDataProvider(trace, fId, ITmfTreeDataProvider.class);
     }
 
     @Override

diff --git a/...c/org/eclipse/tracecompass/tmf/ui/viewers/xychart/linechart/TmfFilteredXYChartViewer.java b/...c/org/eclipse/tracecompass/tmf/ui/viewers/xychart/linechart/TmfFilteredXYChartViewer.java
@@ -153,7 +153,7 @@ public void traceClosed(@Nullable TmfTraceClosedSignal signal) {
 
     @Override
     protected ITmfXYDataProvider initializeDataProvider(ITmfTrace trace) {
-        ITmfTreeXYDataProvider<?> dataProvider = DataProviderManager.getInstance().getDataProvider(trace, fId, ITmfTreeXYDataProvider.class);
+        ITmfTreeXYDataProvider<?> dataProvider = DataProviderManager.getInstance().getOrCreateDataProvider(trace, fId, ITmfTreeXYDataProvider.class);
         BaseXYPresentationProvider presentationProvider = getPresentationProvider();
         fUseDefaultStyleValues.computeIfAbsent(presentationProvider, pp -> {
             if (dataProvider instanceof IOutputStyleProvider) {

diff --git a/....tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/statesystem/TmfStateSystemExplorer.java b/....tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/statesystem/TmfStateSystemExplorer.java
@@ -266,7 +266,7 @@ public void handleAnalysisStarted(TmfStartAnalysisSignal signal) {
 
     private StateSystemDataProvider getDataProvider(ITmfTrace moduleTrace) {
         ITimeGraphDataProvider<@NonNull TimeGraphEntryModel> dataProvider = DataProviderManager
-                .getInstance().getDataProvider(Objects.requireNonNull(moduleTrace), getProviderId(), ITimeGraphDataProvider.class);
+                .getInstance().getOrCreateDataProvider(Objects.requireNonNull(moduleTrace), getProviderId(), ITimeGraphDataProvider.class);
         if (dataProvider instanceof StateSystemDataProvider) {
             return (StateSystemDataProvider) dataProvider;
         }

diff --git a/...ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java b/...ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java
@@ -176,7 +176,7 @@ public void createPartControl(Composite parent) {
     @Override
     protected void buildEntryList(@NonNull ITmfTrace trace, @NonNull ITmfTrace parentTrace, @NonNull IProgressMonitor monitor) {
         ITimeGraphDataProvider<@NonNull TimeGraphEntryModel> dataProvider = DataProviderManager
-                .getInstance().getDataProvider(trace, getProviderId(), ITimeGraphDataProvider.class);
+                .getInstance().getOrCreateDataProvider(trace, getProviderId(), ITimeGraphDataProvider.class);
         if (dataProvider == null) {
             return;
         }