You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2012/08/11 15:02:06 UTC
svn commit: r1371939 -
/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/
Author: tn
Date: Sat Aug 11 13:02:05 2012
New Revision: 1371939
URL: http://svn.apache.org/viewvc?rev=1371939&view=rev
Log:
Remove added inheritDoc tags again.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java?rev=1371939&r1=1371938&r2=1371939&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java Sat Aug 11 13:02:05 2012
@@ -64,23 +64,14 @@ public abstract class AbstractBidiMapDec
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();
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java?rev=1371939&r1=1371938&r2=1371939&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java Sat Aug 11 13:02:05 2012
@@ -130,30 +130,18 @@ public abstract class AbstractDualBidiMa
// 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 AbstractDualBidiMa
// 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 AbstractDualBidiMa
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 AbstractDualBidiMa
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 AbstractDualBidiMa
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 AbstractDualBidiMa
return key;
}
- /**
- * {@inheritDoc}
- */
public BidiMap<V, K> inverseBidiMap() {
if (inverseBidiMap == null) {
inverseBidiMap = createBidiMap(reverseMap, normalMap, this);
@@ -728,19 +692,16 @@ public abstract class AbstractDualBidiMa
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 AbstractDualBidiMa
canRemove = false;
}
- /** {@inheritDoc} */
public K getKey() {
if (last == null) {
throw new IllegalStateException(
@@ -762,7 +722,6 @@ public abstract class AbstractDualBidiMa
return last.getKey();
}
- /** {@inheritDoc} */
public V getValue() {
if (last == null) {
throw new IllegalStateException(
@@ -771,7 +730,6 @@ public abstract class AbstractDualBidiMa
return last.getValue();
}
- /** {@inheritDoc} */
public V setValue(V value) {
if (last == null) {
throw new IllegalStateException(
@@ -785,7 +743,6 @@ public abstract class AbstractDualBidiMa
return parent.put(last.getKey(), value);
}
- /** {@inheritDoc} */
public void reset() {
iterator = parent.normalMap.entrySet().iterator();
last = null;
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java?rev=1371939&r1=1371938&r2=1371939&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java Sat Aug 11 13:02:05 2012
@@ -64,30 +64,18 @@ public abstract class AbstractOrderedBid
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);
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java?rev=1371939&r1=1371938&r2=1371939&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java Sat Aug 11 13:02:05 2012
@@ -65,37 +65,22 @@ public abstract class AbstractSortedBidi
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);
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java?rev=1371939&r1=1371938&r2=1371939&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java Sat Aug 11 13:02:05 2012
@@ -126,38 +126,23 @@ public class DualTreeBidiMap<K, V> exten
//-----------------------------------------------------------------------
- /**
- * {@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> exten
return null;
}
- /**
- * {@inheritDoc}
- */
public K previousKey(K key) {
if (isEmpty()) {
return null;
@@ -206,49 +188,31 @@ public class DualTreeBidiMap<K, V> exten
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> exten
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> exten
return last.getKey();
}
- /** {@inheritDoc} */
public V getValue() {
if (last == null) {
throw new IllegalStateException(
@@ -393,7 +350,6 @@ public class DualTreeBidiMap<K, V> exten
return last.getValue();
}
- /** {@inheritDoc} */
public V setValue(V value) {
if (last == null) {
throw new IllegalStateException(
@@ -407,7 +363,6 @@ public class DualTreeBidiMap<K, V> exten
return parent.put(last.getKey(), value);
}
- /** {@inheritDoc} */
public void reset() {
iterator = new ArrayList<Map.Entry<K, V>>(parent.entrySet()).listIterator();
last = null;
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java?rev=1371939&r1=1371938&r2=1371939&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java Sat Aug 11 13:02:05 2012
@@ -88,9 +88,6 @@ public class TreeBidiMap<K extends Compa
this.description = description;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return description;
@@ -417,9 +414,6 @@ public class TreeBidiMap<K extends Compa
}
//-----------------------------------------------------------------------
- /**
- * {@inheritDoc}
- */
public OrderedMapIterator<K, V> mapIterator() {
if (isEmpty()) {
return EmptyOrderedMapIterator.<K, V>emptyOrderedMapIterator();