diff options
Diffstat (limited to 'android/guava/src/com/google/common/collect/TreeRangeMap.java')
-rw-r--r-- | android/guava/src/com/google/common/collect/TreeRangeMap.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/android/guava/src/com/google/common/collect/TreeRangeMap.java b/android/guava/src/com/google/common/collect/TreeRangeMap.java index 0ce8e8955..0797f8964 100644 --- a/android/guava/src/com/google/common/collect/TreeRangeMap.java +++ b/android/guava/src/com/google/common/collect/TreeRangeMap.java @@ -23,7 +23,6 @@ import static com.google.common.base.Predicates.in; import static com.google.common.base.Predicates.not; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.MoreObjects; import com.google.common.base.Predicate; @@ -49,7 +48,6 @@ import javax.annotation.CheckForNull; * @author Louis Wasserman * @since 14.0 */ -@Beta @GwtIncompatible // NavigableMap @ElementTypesAreNonnullByDefault public final class TreeRangeMap<K extends Comparable, V> implements RangeMap<K, V> { @@ -167,8 +165,8 @@ public final class TreeRangeMap<K extends Comparable, V> implements RangeMap<K, } @Override - public void putAll(RangeMap<K, V> rangeMap) { - for (Entry<Range<K>, V> entry : rangeMap.asMapOfRanges().entrySet()) { + public void putAll(RangeMap<K, ? extends V> rangeMap) { + for (Entry<Range<K>, ? extends V> entry : rangeMap.asMapOfRanges().entrySet()) { put(entry.getKey(), entry.getValue()); } } @@ -341,7 +339,7 @@ public final class TreeRangeMap<K extends Comparable, V> implements RangeMap<K, } @Override - public void putAll(RangeMap<Comparable<?>, Object> rangeMap) { + public void putAll(RangeMap<Comparable<?>, ? extends Object> rangeMap) { if (!rangeMap.asMapOfRanges().isEmpty()) { throw new IllegalArgumentException( "Cannot putAll(nonEmptyRangeMap) into an empty subRangeMap"); @@ -447,7 +445,7 @@ public final class TreeRangeMap<K extends Comparable, V> implements RangeMap<K, } @Override - public void putAll(RangeMap<K, V> rangeMap) { + public void putAll(RangeMap<K, ? extends V> rangeMap) { if (rangeMap.asMapOfRanges().isEmpty()) { return; } |