Remove added inheritDoc tags again.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1371939 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
bd169e674c
commit
6d5d858b17
|
@ -64,23 +64,14 @@ public abstract class AbstractBidiMapDecorator<K, V>
|
|||
return decorated().mapIterator();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public K getKey(Object value) {
|
||||
return decorated().getKey(value);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public K removeValue(Object value) {
|
||||
return decorated().removeValue(value);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public BidiMap<V, K> inverseBidiMap() {
|
||||
return decorated().inverseBidiMap();
|
||||
}
|
||||
|
|
|
@ -130,30 +130,18 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
|
|||
// Map delegation
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public V get(Object key) {
|
||||
return normalMap.get(key);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public int size() {
|
||||
return normalMap.size();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public boolean isEmpty() {
|
||||
return normalMap.isEmpty();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public boolean containsKey(Object key) {
|
||||
return normalMap.containsKey(key);
|
||||
}
|
||||
|
@ -176,9 +164,6 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
|
|||
// BidiMap changes
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public V put(K key, V value) {
|
||||
if (normalMap.containsKey(key)) {
|
||||
reverseMap.remove(normalMap.get(key));
|
||||
|
@ -191,18 +176,12 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
|
|||
return obj;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public void putAll(Map<? extends K, ? extends V> map) {
|
||||
for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
|
||||
put(entry.getKey(), entry.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public V remove(Object key) {
|
||||
V value = null;
|
||||
if (normalMap.containsKey(key)) {
|
||||
|
@ -212,17 +191,11 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
|
|||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public void clear() {
|
||||
normalMap.clear();
|
||||
reverseMap.clear();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public boolean containsValue(Object value) {
|
||||
return reverseMap.containsKey(value);
|
||||
}
|
||||
|
@ -244,16 +217,10 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
|
|||
return new BidiMapIterator<K, V>(this);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public K getKey(Object value) {
|
||||
return reverseMap.get(value);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public K removeValue(Object value) {
|
||||
K key = null;
|
||||
if (reverseMap.containsKey(value)) {
|
||||
|
@ -263,9 +230,6 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
|
|||
return key;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public BidiMap<V, K> inverseBidiMap() {
|
||||
if (inverseBidiMap == null) {
|
||||
inverseBidiMap = createBidiMap(reverseMap, normalMap, this);
|
||||
|
@ -728,19 +692,16 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
|
|||
this.iterator = parent.normalMap.entrySet().iterator();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public boolean hasNext() {
|
||||
return iterator.hasNext();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public K next() {
|
||||
last = iterator.next();
|
||||
canRemove = true;
|
||||
return last.getKey();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public void remove() {
|
||||
if (canRemove == false) {
|
||||
throw new IllegalStateException("Iterator remove() can only be called once after next()");
|
||||
|
@ -753,7 +714,6 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
|
|||
canRemove = false;
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public K getKey() {
|
||||
if (last == null) {
|
||||
throw new IllegalStateException(
|
||||
|
@ -762,7 +722,6 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
|
|||
return last.getKey();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public V getValue() {
|
||||
if (last == null) {
|
||||
throw new IllegalStateException(
|
||||
|
@ -771,7 +730,6 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
|
|||
return last.getValue();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public V setValue(V value) {
|
||||
if (last == null) {
|
||||
throw new IllegalStateException(
|
||||
|
@ -785,7 +743,6 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
|
|||
return parent.put(last.getKey(), value);
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public void reset() {
|
||||
iterator = parent.normalMap.entrySet().iterator();
|
||||
last = null;
|
||||
|
|
|
@ -64,30 +64,18 @@ public abstract class AbstractOrderedBidiMapDecorator<K, V>
|
|||
return decorated().mapIterator();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public K firstKey() {
|
||||
return decorated().firstKey();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public K lastKey() {
|
||||
return decorated().lastKey();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public K nextKey(K key) {
|
||||
return decorated().nextKey(key);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public K previousKey(K key) {
|
||||
return decorated().previousKey(key);
|
||||
}
|
||||
|
|
|
@ -65,37 +65,22 @@ public abstract class AbstractSortedBidiMapDecorator<K, V>
|
|||
return decorated().inverseBidiMap();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public Comparator<? super K> comparator() {
|
||||
return decorated().comparator();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public Comparator<? super V> valueComparator() {
|
||||
return decorated().valueComparator();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public SortedMap<K, V> subMap(K fromKey, K toKey) {
|
||||
return decorated().subMap(fromKey, toKey);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public SortedMap<K, V> headMap(K toKey) {
|
||||
return decorated().headMap(toKey);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public SortedMap<K, V> tailMap(K fromKey) {
|
||||
return decorated().tailMap(fromKey);
|
||||
}
|
||||
|
|
|
@ -126,38 +126,23 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V>
|
|||
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public Comparator<? super K> comparator() {
|
||||
return ((SortedMap<K, V>) normalMap).comparator();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public Comparator<? super V> valueComparator() {
|
||||
return ((SortedMap<V, K>) reverseMap).comparator();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public K firstKey() {
|
||||
return ((SortedMap<K, V>) normalMap).firstKey();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public K lastKey() {
|
||||
return ((SortedMap<K, V>) normalMap).lastKey();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public K nextKey(K key) {
|
||||
if (isEmpty()) {
|
||||
return null;
|
||||
|
@ -174,9 +159,6 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V>
|
|||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public K previousKey(K key) {
|
||||
if (isEmpty()) {
|
||||
return null;
|
||||
|
@ -206,49 +188,31 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V>
|
|||
return new BidiOrderedMapIterator<K, V>(this);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public SortedBidiMap<V, K> inverseSortedBidiMap() {
|
||||
return inverseBidiMap();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public OrderedBidiMap<V, K> inverseOrderedBidiMap() {
|
||||
return inverseBidiMap();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public SortedMap<K, V> headMap(K toKey) {
|
||||
SortedMap<K, V> sub = ((SortedMap<K, V>) normalMap).headMap(toKey);
|
||||
return new ViewMap<K, V>(this, sub);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public SortedMap<K, V> tailMap(K fromKey) {
|
||||
SortedMap<K, V> sub = ((SortedMap<K, V>) normalMap).tailMap(fromKey);
|
||||
return new ViewMap<K, V>(this, sub);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public SortedMap<K, V> subMap(K fromKey, K toKey) {
|
||||
SortedMap<K, V> sub = ((SortedMap<K, V>) normalMap).subMap(fromKey, toKey);
|
||||
return new ViewMap<K, V>(this, sub);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public SortedBidiMap<V, K> inverseBidiMap() {
|
||||
return (SortedBidiMap<V, K>) super.inverseBidiMap();
|
||||
|
@ -346,36 +310,30 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V>
|
|||
iterator = new ArrayList<Map.Entry<K, V>>(parent.entrySet()).listIterator();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public boolean hasNext() {
|
||||
return iterator.hasNext();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public K next() {
|
||||
last = iterator.next();
|
||||
return last.getKey();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public boolean hasPrevious() {
|
||||
return iterator.hasPrevious();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public K previous() {
|
||||
last = iterator.previous();
|
||||
return last.getKey();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public void remove() {
|
||||
iterator.remove();
|
||||
parent.remove(last.getKey());
|
||||
last = null;
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public K getKey() {
|
||||
if (last == null) {
|
||||
throw new IllegalStateException(
|
||||
|
@ -384,7 +342,6 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V>
|
|||
return last.getKey();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public V getValue() {
|
||||
if (last == null) {
|
||||
throw new IllegalStateException(
|
||||
|
@ -393,7 +350,6 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V>
|
|||
return last.getValue();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public V setValue(V value) {
|
||||
if (last == null) {
|
||||
throw new IllegalStateException(
|
||||
|
@ -407,7 +363,6 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V>
|
|||
return parent.put(last.getKey(), value);
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public void reset() {
|
||||
iterator = new ArrayList<Map.Entry<K, V>>(parent.entrySet()).listIterator();
|
||||
last = null;
|
||||
|
|
|
@ -88,9 +88,6 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>> imple
|
|||
this.description = description;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public String toString() {
|
||||
return description;
|
||||
|
@ -417,9 +414,6 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>> imple
|
|||
}
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public OrderedMapIterator<K, V> mapIterator() {
|
||||
if (isEmpty()) {
|
||||
return EmptyOrderedMapIterator.<K, V>emptyOrderedMapIterator();
|
||||
|
|
Loading…
Reference in New Issue