Skip to content

Commit

Permalink
Bug 581856: Remove deprecated DataProviderManager.getDataProvider
Browse files Browse the repository at this point in the history 
Replace it with sibling getOrCreateDataProvider use, as prescribed by
the deprecation notice.

Deprecated in org.eclipse.tracecompass commit cee48a6d30, since v8.0.0.

This change accompanies the corresponding removal in o.e.tracecompass.

Change-Id: I8c77d773f8877efec9ec758e685a5f2ec9e9f8ec
Signed-off-by: Marco Miller <marco.miller@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/201597
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>
  • Loading branch information
@marco-miller
marco-miller committed Apr 28, 2023
1 parent 99ff910 commit bc0b54f
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions ...ipse/tracecompass/incubator/internal/kernel/ui/views/fileaccess/FileAccessByFileView.java
View file
Expand Up @@ -123,7 +123,7 @@ public String getColumnText(Object element, int columnIndex) {
}
if (columnIndex == 2) {
FileAccessDataProvider dp = DataProviderManager
.getInstance().getDataProvider(getTrace(), getProviderId(), FileAccessDataProvider.class);
.getInstance().getOrCreateDataProvider(getTrace(), getProviderId(), FileAccessDataProvider.class);
ITmfTrace activeTrace = TmfTraceManager.getInstance().getActiveTrace();
if (activeTrace != null && dp != null) {
TmfTimeRange tr = activeTrace.getTimeRange();
Expand All @@ -132,7 +132,7 @@ public String getColumnText(Object element, int columnIndex) {
}
if (columnIndex == 3) {
FileAccessDataProvider dp = DataProviderManager
.getInstance().getDataProvider(getTrace(), getProviderId(), FileAccessDataProvider.class);
.getInstance().getOrCreateDataProvider(getTrace(), getProviderId(), FileAccessDataProvider.class);
ITmfTrace activeTrace = TmfTraceManager.getInstance().getActiveTrace();
if (activeTrace != null && dp != null) {
TmfTimeRange tr = activeTrace.getTimeRange();
Expand Down
2 changes: 1 addition & 1 deletion ...tor/internal/tmf/ui/multiview/ui/view/timegraph/BaseDataProviderTimeGraphMultiViewer.java
View file
Expand Up @@ -173,7 +173,7 @@ protected String getProviderId() {
@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;
}
Expand Down
2 changes: 1 addition & 1 deletion ...c/org/eclipse/tracecompass/incubator/internal/callstack/ui/flamegraph/FlameGraphView.java
View file
Expand Up @@ -413,7 +413,7 @@ public void run(IProgressMonitor monitor) {

private void buildEntryList(@NonNull ITmfTrace trace, @NonNull ITmfTrace parentTrace, @NonNull Map<String, Object> additionalParams, @NonNull IProgressMonitor monitor) {
ITimeGraphDataProvider<@NonNull TimeGraphEntryModel> dataProvider = DataProviderManager
.getInstance().getDataProvider(trace, getProviderId(), ITimeGraphDataProvider.class);
.getInstance().getOrCreateDataProvider(trace, getProviderId(), ITimeGraphDataProvider.class);
if (dataProvider == null) {
return;
}
Expand Down
4 changes: 2 additions & 2 deletions ...e/tracecompass/incubator/internal/scripting/ui/views/timegraph/ScriptedTimeGraphView.java
View file
Expand Up @@ -87,7 +87,7 @@ protected String getProviderId() {
public void refreshIfNeeded() {
ITmfTrace trace = getTrace();
ITimeGraphDataProvider<@NonNull TimeGraphEntryModel> dataProvider = DataProviderManager
.getInstance().getDataProvider(trace, getProviderId(), ITimeGraphDataProvider.class);
.getInstance().getOrCreateDataProvider(trace, getProviderId(), ITimeGraphDataProvider.class);
if (dataProvider != fProvider) {
rebuild();
}
Expand All @@ -96,7 +96,7 @@ public void refreshIfNeeded() {
@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);
fProvider = dataProvider;
super.buildEntryList(trace, parentTrace, monitor);
}
Expand Down
2 changes: 1 addition & 1 deletion ...ipse/tracecompass/incubator/internal/scripting/ui/views/xychart/ScriptedXYTreeViewer.java
View file
Expand Up @@ -80,7 +80,7 @@ protected ITmfTreeColumnDataProvider getColumnDataProvider() {
return null;
}
return DataProviderManager
.getInstance().getDataProvider(trace, fProviderId, ITmfTreeDataProvider.class);
.getInstance().getOrCreateDataProvider(trace, fProviderId, ITmfTreeDataProvider.class);
}

}
14 changes: 7 additions & 7 deletions ...ompass/incubator/internal/trace/server/jersey/rest/core/services/DataProviderService.java
View file
Expand Up @@ -389,7 +389,7 @@ public Response getXY(
return Response.status(Status.NOT_FOUND).entity(NO_SUCH_TRACE).build();
}

ITmfTreeXYDataProvider<@NonNull ITmfTreeDataModel> provider = manager.getDataProvider(experiment,
ITmfTreeXYDataProvider<@NonNull ITmfTreeDataModel> provider = manager.getOrCreateDataProvider(experiment,
outputId, ITmfTreeXYDataProvider.class);

if (provider == null) {
Expand Down Expand Up @@ -658,7 +658,7 @@ public Response getAnnotationCategories(
return Response.status(Status.NOT_FOUND).entity(NO_SUCH_TRACE).build();
}

ITmfTreeDataProvider<? extends @NonNull ITmfTreeDataModel> provider = manager.getDataProvider(experiment,
ITmfTreeDataProvider<? extends @NonNull ITmfTreeDataModel> provider = manager.getOrCreateDataProvider(experiment,
outputId, ITmfTreeDataProvider.class);

if (provider == null) {
Expand Down Expand Up @@ -742,7 +742,7 @@ public Response getAnnotations(
return Response.status(Status.NOT_FOUND).entity(NO_SUCH_TRACE).build();
}

ITmfTreeDataProvider<? extends @NonNull ITmfTreeDataModel> provider = manager.getDataProvider(experiment,
ITmfTreeDataProvider<? extends @NonNull ITmfTreeDataModel> provider = manager.getOrCreateDataProvider(experiment,
outputId, ITmfTreeDataProvider.class);

if (provider == null) {
Expand Down Expand Up @@ -854,7 +854,7 @@ public Response getTimeGraphTooltip(
}

private ITimeGraphDataProvider<@NonNull ITimeGraphEntryModel> getTimeGraphProvider(@NonNull ITmfTrace trace, String outputId) {
ITimeGraphDataProvider<@NonNull ITimeGraphEntryModel> provider = manager.getDataProvider(trace,
ITimeGraphDataProvider<@NonNull ITimeGraphEntryModel> provider = manager.getOrCreateDataProvider(trace,
outputId, ITimeGraphDataProvider.class);

if (provider == null && outputId != null) {
Expand Down Expand Up @@ -957,7 +957,7 @@ public Response getLines(
return Response.status(Status.NOT_FOUND).entity(NO_SUCH_TRACE).build();
}

ITmfVirtualTableDataProvider<? extends IVirtualTableLine, ? extends ITmfTreeDataModel> provider = manager.getDataProvider(experiment, outputId, ITmfVirtualTableDataProvider.class);
ITmfVirtualTableDataProvider<? extends IVirtualTableLine, ? extends ITmfTreeDataModel> provider = manager.getOrCreateDataProvider(experiment, outputId, ITmfVirtualTableDataProvider.class);
if (provider == null) {
return Response.status(Status.METHOD_NOT_ALLOWED).entity(NO_PROVIDER).build();
}
Expand Down Expand Up @@ -1054,7 +1054,7 @@ private Response getTree(UUID expUUID, String outputId, QueryParameters queryPar
return Response.status(Status.NOT_FOUND).entity(NO_SUCH_TRACE).build();
}

ITmfTreeDataProvider<? extends @NonNull ITmfTreeDataModel> provider = manager.getDataProvider(experiment,
ITmfTreeDataProvider<? extends @NonNull ITmfTreeDataModel> provider = manager.getOrCreateDataProvider(experiment,
outputId, ITmfTreeDataProvider.class);

if (provider == null) {
Expand Down Expand Up @@ -1121,7 +1121,7 @@ public Response getStyles(
return Response.status(Status.NOT_FOUND).entity(NO_SUCH_TRACE).build();
}

ITmfTreeDataProvider<? extends @NonNull ITmfTreeDataModel> provider = manager.getDataProvider(experiment,
ITmfTreeDataProvider<? extends @NonNull ITmfTreeDataModel> provider = manager.getOrCreateDataProvider(experiment,
outputId, ITmfTreeDataProvider.class);

if (provider == null) {
Expand Down
4 changes: 2 additions & 2 deletions ...src/org/eclipse/tracecompass/incubator/internal/traceevent/ui/markers/ContextMarkers.java
View file
Expand Up @@ -69,7 +69,7 @@ public ContextMarkers() {
return Collections.emptyList();
}

ContextDataProvider dataProvider = DataProviderManager.getInstance().getDataProvider(activeTrace, ContextDataProvider.ID, ContextDataProvider.class);
ContextDataProvider dataProvider = DataProviderManager.getInstance().getOrCreateDataProvider(activeTrace, ContextDataProvider.ID, ContextDataProvider.class);
if (dataProvider == null) {
return Collections.emptyList();
}
Expand All @@ -94,7 +94,7 @@ public ContextMarkers() {
if (activeTrace == null) {
return Collections.emptyList();
}
ContextDataProvider dataProvider = DataProviderManager.getInstance().getDataProvider(activeTrace, ContextDataProvider.ID, ContextDataProvider.class);
ContextDataProvider dataProvider = DataProviderManager.getInstance().getOrCreateDataProvider(activeTrace, ContextDataProvider.ID, ContextDataProvider.class);
if (dataProvider == null) {
return Collections.emptyList();
}
Expand Down

0 comments on commit bc0b54f

Please sign in to comment.