diff options
Diffstat (limited to 'guava/src/com/google/common/collect/ForwardingMultiset.java')
-rw-r--r-- | guava/src/com/google/common/collect/ForwardingMultiset.java | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/guava/src/com/google/common/collect/ForwardingMultiset.java b/guava/src/com/google/common/collect/ForwardingMultiset.java index 9834751..4e1ceed 100644 --- a/guava/src/com/google/common/collect/ForwardingMultiset.java +++ b/guava/src/com/google/common/collect/ForwardingMultiset.java @@ -107,7 +107,7 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> * * @since 7.0 */ - @Override protected boolean standardContains(@Nullable Object object) { + @Override @Beta protected boolean standardContains(@Nullable Object object) { return count(object) > 0; } @@ -118,8 +118,12 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> * * @since 7.0 */ - @Override protected void standardClear() { - Iterators.clear(entrySet().iterator()); + @Override @Beta protected void standardClear() { + Iterator<Entry<E>> entryIterator = entrySet().iterator(); + while (entryIterator.hasNext()) { + entryIterator.next(); + entryIterator.remove(); + } } /** @@ -145,7 +149,7 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> * * @since 7.0 */ - protected boolean standardAdd(E element) { + @Beta protected boolean standardAdd(E element) { add(element, 1); return true; } @@ -171,7 +175,7 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> * * @since 7.0 */ - @Override protected boolean standardRemove(Object element) { + @Beta @Override protected boolean standardRemove(Object element) { return remove(element, 1) > 0; } @@ -183,7 +187,7 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> * * @since 7.0 */ - @Override protected boolean standardRemoveAll( + @Beta @Override protected boolean standardRemoveAll( Collection<?> elementsToRemove) { return Multisets.removeAllImpl(this, elementsToRemove); } @@ -196,7 +200,7 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> * * @since 7.0 */ - @Override protected boolean standardRetainAll( + @Beta @Override protected boolean standardRetainAll( Collection<?> elementsToRetain) { return Multisets.retainAllImpl(this, elementsToRetain); } @@ -210,7 +214,7 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> * * @since 7.0 */ - protected int standardSetCount(E element, int count) { + @Beta protected int standardSetCount(E element, int count) { return Multisets.setCountImpl(this, element, count); } @@ -222,7 +226,8 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> * * @since 7.0 */ - protected boolean standardSetCount(E element, int oldCount, int newCount) { + @Beta protected boolean standardSetCount( + E element, int oldCount, int newCount) { return Multisets.setCountImpl(this, element, oldCount, newCount); } @@ -241,7 +246,6 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> */ @Beta protected class StandardElementSet extends Multisets.ElementSet<E> { - /** Constructor for use by subclasses. */ public StandardElementSet() {} @Override @@ -257,7 +261,7 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> * * @since 7.0 */ - protected Iterator<E> standardIterator() { + @Beta protected Iterator<E> standardIterator() { return Multisets.iteratorImpl(this); } @@ -268,7 +272,7 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> * * @since 7.0 */ - protected int standardSize() { + @Beta protected int standardSize() { return Multisets.sizeImpl(this); } @@ -280,7 +284,7 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> * * @since 7.0 */ - protected boolean standardEquals(@Nullable Object object) { + @Beta protected boolean standardEquals(@Nullable Object object) { return Multisets.equalsImpl(this, object); } @@ -291,7 +295,7 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> * * @since 7.0 */ - protected int standardHashCode() { + @Beta protected int standardHashCode() { return entrySet().hashCode(); } @@ -302,7 +306,7 @@ public abstract class ForwardingMultiset<E> extends ForwardingCollection<E> * * @since 7.0 */ - @Override protected String standardToString() { + @Beta @Override protected String standardToString() { return entrySet().toString(); } } |