Skip to content

Commit

Permalink
Bug 581856: Remove the deprecated hasCommonXAxis()
Browse files Browse the repository at this point in the history
Deprecated in commit 843c8f4, 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 <marco.miller@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/201589
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 committed Apr 28, 2023
1 parent 4b7b979 commit bc26659
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 33 deletions.
Expand Up @@ -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<ISeriesModel> getSeriesData() {
return fSeries;
}

Expand All @@ -102,7 +93,7 @@ public boolean hasCommonXAxis() {
*/
@Deprecated
@Override
public @NonNull Collection<@NonNull IYModel> getYSeriesData() {
public @NonNull Collection<IYModel> getYSeriesData() {
return fYSeries;
}
}
Expand Up @@ -55,16 +55,7 @@ public TmfXyModel(String title, Collection<ISeriesModel> series) {
}

@Override
public @NonNull Collection<@NonNull ISeriesModel> getSeriesData() {
public @NonNull Collection<ISeriesModel> getSeriesData() {
return fSeries;
}

/**
* @deprecated As currently unused, at least in o.e.tracecompass.
*/
@Deprecated
@Override
public boolean hasCommonXAxis() {
return false;
}
}
Expand Up @@ -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}
*
Expand Down

0 comments on commit bc26659

Please sign in to comment.