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/26 21:23:25 UTC
svn commit: r1377489 - in
/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie:
SynchronizedTrie.java UnmodifiableTrie.java
Author: tn
Date: Sun Aug 26 19:23:25 2012
New Revision: 1377489
URL: http://svn.apache.org/viewvc?rev=1377489&view=rev
Log:
Removed unneeded inheritDoc tags, formatting.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/SynchronizedTrie.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/UnmodifiableTrie.java
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/SynchronizedTrie.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/SynchronizedTrie.java?rev=1377489&r1=1377488&r2=1377489&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/SynchronizedTrie.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/SynchronizedTrie.java Sun Aug 26 19:23:25 2012
@@ -43,6 +43,8 @@ public class SynchronizedTrie<K, V> impl
/**
* Factory method to create a synchronized trie.
*
+ * @param <K> the key type
+ * @param <V> the value type
* @param trie the trie to decorate, must not be null
* @return a new synchronized trie
* @throws IllegalArgumentException if trie is null
@@ -65,200 +67,115 @@ public class SynchronizedTrie<K, V> impl
this.delegate = trie;
}
- /**
- * {@inheritDoc}
- */
- public synchronized Entry<K, V> select(K key,
- Cursor<? super K, ? super V> cursor) {
+ public synchronized Entry<K, V> select(K key, Cursor<? super K, ? super V> cursor) {
return delegate.select(key, cursor);
}
- /**
- * {@inheritDoc}
- */
public synchronized Entry<K, V> select(K key) {
return delegate.select(key);
}
- /**
- * {@inheritDoc}
- */
public synchronized K selectKey(K key) {
return delegate.selectKey(key);
}
- /**
- * {@inheritDoc}
- */
public synchronized V selectValue(K key) {
return delegate.selectValue(key);
}
- /**
- * {@inheritDoc}
- */
public synchronized Entry<K, V> traverse(Cursor<? super K, ? super V> cursor) {
return delegate.traverse(cursor);
}
- /**
- * {@inheritDoc}
- */
public synchronized Set<Entry<K, V>> entrySet() {
return SynchronizedSet.synchronizedSet(delegate.entrySet());
}
- /**
- * {@inheritDoc}
- */
public synchronized Set<K> keySet() {
return SynchronizedSet.synchronizedSet(delegate.keySet());
}
- /**
- * {@inheritDoc}
- */
public synchronized Collection<V> values() {
return SynchronizedCollection.synchronizedCollection(delegate.values());
}
- /**
- * {@inheritDoc}
- */
public synchronized void clear() {
delegate.clear();
}
- /**
- * {@inheritDoc}
- */
public synchronized boolean containsKey(Object key) {
return delegate.containsKey(key);
}
- /**
- * {@inheritDoc}
- */
public synchronized boolean containsValue(Object value) {
return delegate.containsValue(value);
}
- /**
- * {@inheritDoc}
- */
public synchronized V get(Object key) {
return delegate.get(key);
}
- /**
- * {@inheritDoc}
- */
public synchronized boolean isEmpty() {
return delegate.isEmpty();
}
- /**
- * {@inheritDoc}
- */
public synchronized V put(K key, V value) {
return delegate.put(key, value);
}
- /**
- * {@inheritDoc}
- */
public synchronized void putAll(Map<? extends K, ? extends V> m) {
delegate.putAll(m);
}
- /**
- * {@inheritDoc}
- */
public synchronized V remove(Object key) {
return delegate.remove(key);
}
- /**
- * {@inheritDoc}
- */
public synchronized K lastKey() {
return delegate.lastKey();
}
- /**
- * {@inheritDoc}
- */
public synchronized SortedMap<K, V> subMap(K fromKey, K toKey) {
return Collections.synchronizedSortedMap(delegate.subMap(fromKey, toKey));
}
- /**
- * {@inheritDoc}
- */
public synchronized SortedMap<K, V> tailMap(K fromKey) {
return Collections.synchronizedSortedMap(delegate.tailMap(fromKey));
}
- /**
- * {@inheritDoc}
- */
public synchronized Comparator<? super K> comparator() {
return delegate.comparator();
}
- /**
- * {@inheritDoc}
- */
public synchronized K firstKey() {
return delegate.firstKey();
}
- /**
- * {@inheritDoc}
- */
public synchronized SortedMap<K, V> headMap(K toKey) {
return Collections.synchronizedSortedMap(delegate.headMap(toKey));
}
- /**
- * {@inheritDoc}
- */
public synchronized SortedMap<K, V> getPrefixedBy(K key, int offset, int length) {
return Collections.synchronizedSortedMap(delegate.getPrefixedBy(key, offset, length));
}
- /**
- * {@inheritDoc}
- */
public synchronized SortedMap<K, V> getPrefixedBy(K key, int length) {
return Collections.synchronizedSortedMap(delegate.getPrefixedBy(key, length));
}
- /**
- * {@inheritDoc}
- */
public synchronized SortedMap<K, V> getPrefixedBy(K key) {
return Collections.synchronizedSortedMap(delegate.getPrefixedBy(key));
}
- /**
- * {@inheritDoc}
- */
public synchronized SortedMap<K, V> getPrefixedByBits(K key, int lengthInBits) {
return Collections.synchronizedSortedMap(delegate.getPrefixedByBits(key, lengthInBits));
}
- /**
- * {@inheritDoc}
- */
public synchronized SortedMap<K, V> getPrefixedByBits(K key,
int offsetInBits, int lengthInBits) {
return Collections.synchronizedSortedMap(delegate.getPrefixedByBits(key, offsetInBits, lengthInBits));
}
- /**
- * {@inheritDoc}
- */
public synchronized int size() {
return delegate.size();
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/UnmodifiableTrie.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/UnmodifiableTrie.java?rev=1377489&r1=1377488&r2=1377489&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/UnmodifiableTrie.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/UnmodifiableTrie.java Sun Aug 26 19:23:25 2012
@@ -26,6 +26,8 @@ public class UnmodifiableTrie<K, V> impl
/**
* Factory method to create a unmodifiable trie.
*
+ * @param <K> the key type
+ * @param <V> the value type
* @param trie the trie to decorate, must not be null
* @return a new unmodifiable trie
* @throws IllegalArgumentException if trie is null
@@ -39,18 +41,15 @@ public class UnmodifiableTrie<K, V> impl
* Constructor that wraps (not copies).
*
* @param trie the trie to decorate, must not be null
- * @throws IllegalArgumentException if set is null
+ * @throws IllegalArgumentException if trie is null
*/
public UnmodifiableTrie(Trie<K, V> trie) {
if (trie == null) {
- throw new IllegalArgumentException("Collection must not be null");
+ throw new IllegalArgumentException("Trie must not be null");
}
this.delegate = trie;
}
- /**
- * {@inheritDoc}
- */
public Entry<K, V> select(K key, final Cursor<? super K, ? super V> cursor) {
Cursor<K, V> c = new Cursor<K, V>() {
public Decision select(Map.Entry<? extends K, ? extends V> entry) {
@@ -71,30 +70,18 @@ public class UnmodifiableTrie<K, V> impl
return delegate.select(key, c);
}
- /**
- * {@inheritDoc}
- */
public Entry<K, V> select(K key) {
return delegate.select(key);
}
- /**
- * {@inheritDoc}
- */
public K selectKey(K key) {
return delegate.selectKey(key);
}
- /**
- * {@inheritDoc}
- */
public V selectValue(K key) {
return delegate.selectValue(key);
}
- /**
- * {@inheritDoc}
- */
public Entry<K, V> traverse(final Cursor<? super K, ? super V> cursor) {
Cursor<K, V> c = new Cursor<K, V>() {
public Decision select(Map.Entry<? extends K, ? extends V> entry) {
@@ -115,177 +102,103 @@ public class UnmodifiableTrie<K, V> impl
return delegate.traverse(c);
}
- /**
- * {@inheritDoc}
- */
public Set<Entry<K, V>> entrySet() {
return Collections.unmodifiableSet(delegate.entrySet());
}
- /**
- * {@inheritDoc}
- */
public Set<K> keySet() {
return Collections.unmodifiableSet(delegate.keySet());
}
- /**
- * {@inheritDoc}
- */
public Collection<V> values() {
return Collections.unmodifiableCollection(delegate.values());
}
- /**
- * {@inheritDoc}
- */
public void clear() {
throw new UnsupportedOperationException();
}
- /**
- * {@inheritDoc}
- */
public boolean containsKey(Object key) {
return delegate.containsKey(key);
}
- /**
- * {@inheritDoc}
- */
public boolean containsValue(Object value) {
return delegate.containsValue(value);
}
- /**
- * {@inheritDoc}
- */
public V get(Object key) {
return delegate.get(key);
}
- /**
- * {@inheritDoc}
- */
public boolean isEmpty() {
return delegate.isEmpty();
}
- /**
- * {@inheritDoc}
- */
public V put(K key, V value) {
throw new UnsupportedOperationException();
}
- /**
- * {@inheritDoc}
- */
public void putAll(Map<? extends K, ? extends V> m) {
throw new UnsupportedOperationException();
}
- /**
- * {@inheritDoc}
- */
public V remove(Object key) {
throw new UnsupportedOperationException();
}
- /**
- * {@inheritDoc}
- */
public K firstKey() {
return delegate.firstKey();
}
- /**
- * {@inheritDoc}
- */
public SortedMap<K, V> headMap(K toKey) {
return Collections.unmodifiableSortedMap(delegate.headMap(toKey));
}
- /**
- * {@inheritDoc}
- */
public K lastKey() {
return delegate.lastKey();
}
- /**
- * {@inheritDoc}
- */
public SortedMap<K, V> subMap(K fromKey, K toKey) {
return Collections.unmodifiableSortedMap(
delegate.subMap(fromKey, toKey));
}
- /**
- * {@inheritDoc}
- */
public SortedMap<K, V> tailMap(K fromKey) {
return Collections.unmodifiableSortedMap(delegate.tailMap(fromKey));
}
- /**
- * {@inheritDoc}
- */
public SortedMap<K, V> getPrefixedBy(K key, int offset, int length) {
return Collections.unmodifiableSortedMap(
delegate.getPrefixedBy(key, offset, length));
}
- /**
- * {@inheritDoc}
- */
public SortedMap<K, V> getPrefixedBy(K key, int length) {
return Collections.unmodifiableSortedMap(
delegate.getPrefixedBy(key, length));
}
- /**
- * {@inheritDoc}
- */
public SortedMap<K, V> getPrefixedBy(K key) {
return Collections.unmodifiableSortedMap(
delegate.getPrefixedBy(key));
}
- /**
- * {@inheritDoc}
- */
public SortedMap<K, V> getPrefixedByBits(K key, int lengthInBits) {
return Collections.unmodifiableSortedMap(
delegate.getPrefixedByBits(key, lengthInBits));
}
- /**
- * {@inheritDoc}
- */
- public SortedMap<K, V> getPrefixedByBits(K key, int offsetInBits,
- int lengthInBits) {
- return Collections.unmodifiableSortedMap(
- delegate.getPrefixedByBits(key, offsetInBits, lengthInBits));
+ public SortedMap<K, V> getPrefixedByBits(K key, int offsetInBits, int lengthInBits) {
+ return Collections.unmodifiableSortedMap(delegate.getPrefixedByBits(key, offsetInBits, lengthInBits));
}
- /**
- * {@inheritDoc}
- */
public Comparator<? super K> comparator() {
return delegate.comparator();
}
- /**
- * {@inheritDoc}
- */
public int size() {
return delegate.size();
}
- /**
- * {@inheritDoc}
- */
public int hashCode() {
return delegate.hashCode();
}