From bc26659b4a0a60671befec01a8b7d5116bec1d51 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Thu, 27 Apr 2023 17:23:29 -0400 Subject: [PATCH] Bug 581856: Remove the deprecated hasCommonXAxis() Deprecated in commit 843c8f4f6c, since v8.0.0. Fix the surrounding Eclipse warning(s) [1] while amending these files. [1] "The nullness annotation is redundant with a default that applies to this location". [Removed] o.e.t.tmf.core.model.TmfCommonXAxisModel.hasCommonXAxis() [Removed] o.e.t.tmf.core.model.TmfXyModel.hasCommonXAxis() [Removed] o.e.t.tmf.core.model.xy.ITmfXyModel.hasCommonXAxis() Change-Id: I0b5b04b4beb66ecccd34385f29f345072733207a Signed-off-by: Marco Miller Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/201589 Tested-by: Trace Compass Bot Tested-by: Bernd Hufmann Reviewed-by: Bernd Hufmann --- .../tmf/core/model/TmfCommonXAxisModel.java | 13 ++----------- .../tracecompass/tmf/core/model/TmfXyModel.java | 11 +---------- .../tracecompass/tmf/core/model/xy/ITmfXyModel.java | 12 ------------ 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/TmfCommonXAxisModel.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/TmfCommonXAxisModel.java index 714f75603f..1b4c6f08af 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/TmfCommonXAxisModel.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/TmfCommonXAxisModel.java @@ -81,17 +81,8 @@ public long[] getXValues() { return fTitle; } - /** - * @deprecated As currently unused, at least in o.e.tracecompass. - */ - @Deprecated - @Override - public boolean hasCommonXAxis() { - return true; - } - @Override - public @NonNull Collection<@NonNull ISeriesModel> getSeriesData() { + public @NonNull Collection getSeriesData() { return fSeries; } @@ -102,7 +93,7 @@ public boolean hasCommonXAxis() { */ @Deprecated @Override - public @NonNull Collection<@NonNull IYModel> getYSeriesData() { + public @NonNull Collection getYSeriesData() { return fYSeries; } } diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/TmfXyModel.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/TmfXyModel.java index 8da13925aa..8e21679bdd 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/TmfXyModel.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/TmfXyModel.java @@ -55,16 +55,7 @@ public TmfXyModel(String title, Collection series) { } @Override - public @NonNull Collection<@NonNull ISeriesModel> getSeriesData() { + public @NonNull Collection getSeriesData() { return fSeries; } - - /** - * @deprecated As currently unused, at least in o.e.tracecompass. - */ - @Deprecated - @Override - public boolean hasCommonXAxis() { - return false; - } } diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/xy/ITmfXyModel.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/xy/ITmfXyModel.java index f9373c2bed..a4af6e5f6e 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/xy/ITmfXyModel.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/xy/ITmfXyModel.java @@ -38,18 +38,6 @@ public interface ITmfXyModel { */ @Nullable String getTitle(); - /** - * True if the x values of the series are common - * - * @return True if X values are common - * @since 5.0 - * @deprecated As currently unused, at least in o.e.tracecompass. - */ - @Deprecated - default boolean hasCommonXAxis() { - return false; - } - /** * Get the collection of {@link ISeriesModel} *