Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…nings.

The `TreeBasedTable` overrides come from cl/16105641. I verified that the methods still appear in the Javadoc when I remove the overrides. (Maven didn't want to regenerate the Javadoc until I ran `clean`....)

RELNOTES=n/a
PiperOrigin-RevId: 725677309
  • Loading branch information
cpovirk authored and Google Java Core Libraries committed Feb 11, 2025
1 parent 96cbfca commit f95fa15
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ public void overriddenNotAnnotatedInSubclass(Object o) {

@Subscribe
@Override
// We are testing how we treat an override with the same behavior and annotations.
@SuppressWarnings("RedundantOverride")
public void overriddenAndAnnotatedInSubclass(Object o) {
super.overriddenAndAnnotatedInSubclass(o);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ public void overriddenAndAnnotatedInSubclass(Object o) {

static class SubClass extends SuperClass {
@Override
// We are testing how we treat an override with the same behavior and annotations.
@SuppressWarnings("RedundantOverride")
public void overriddenInSubclassNowhereAnnotated(Object o) {
super.overriddenInSubclassNowhereAnnotated(o);
}
Expand Down
12 changes: 0 additions & 12 deletions android/guava/src/com/google/common/collect/TreeBasedTable.java
Original file line number Diff line number Diff line change
Expand Up @@ -301,18 +301,6 @@ public boolean containsKey(@Nullable Object key) {
}
}

// rowKeySet() and rowMap() are defined here so they appear in the Javadoc.

@Override
public SortedSet<R> rowKeySet() {
return super.rowKeySet();
}

@Override
public SortedMap<R, Map<C, V>> rowMap() {
return super.rowMap();
}

/** Overridden column iterator to return columns values in globally sorted order. */
@Override
Iterator<C> createColumnKeyIterator() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ public void overriddenNotAnnotatedInSubclass(Object o) {

@Subscribe
@Override
// We are testing how we treat an override with the same behavior and annotations.
@SuppressWarnings("RedundantOverride")
public void overriddenAndAnnotatedInSubclass(Object o) {
super.overriddenAndAnnotatedInSubclass(o);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ public void overriddenAndAnnotatedInSubclass(Object o) {

static class SubClass extends SuperClass {
@Override
// We are testing how we treat an override with the same behavior and annotations.
@SuppressWarnings("RedundantOverride")
public void overriddenInSubclassNowhereAnnotated(Object o) {
super.overriddenInSubclassNowhereAnnotated(o);
}
Expand Down
12 changes: 0 additions & 12 deletions guava/src/com/google/common/collect/TreeBasedTable.java
Original file line number Diff line number Diff line change
Expand Up @@ -301,18 +301,6 @@ public boolean containsKey(@Nullable Object key) {
}
}

// rowKeySet() and rowMap() are defined here so they appear in the Javadoc.

@Override
public SortedSet<R> rowKeySet() {
return super.rowKeySet();
}

@Override
public SortedMap<R, Map<C, V>> rowMap() {
return super.rowMap();
}

/** Overridden column iterator to return columns values in globally sorted order. */
@Override
Iterator<C> createColumnKeyIterator() {
Expand Down

0 comments on commit f95fa15

Please sign in to comment.