Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Javadoc typos; fix internal raw types 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/collections_jdk5_branch@814063 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2009-09-11 22:25:29 +00:00
parent c673ab5f4e
commit 2b056936e6
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/java/org/apache/commons/collections/CollectionUtils.java
View File

@ -386,10 +386,10 @@ public class CollectionUtils {
* @return the the number of occurrences of obj in coll * @return the the number of occurrences of obj in coll
*/ */
public static <O> int cardinality(O obj, final Iterable<? super O> coll) { public static <O> int cardinality(O obj, final Iterable<? super O> coll) {
if (coll instanceof Set) { if (coll instanceof Set<?>) {
return (((Set<? super O>) coll).contains(obj) ? 1 : 0); return (((Set<? super O>) coll).contains(obj) ? 1 : 0);
} }
if (coll instanceof Bag) { if (coll instanceof Bag<?>) {
return ((Bag<? super O>) coll).getCount(obj); return ((Bag<? super O>) coll).getCount(obj);
} }
int count = 0; int count = 0;
@ -492,7 +492,7 @@ public class CollectionUtils {
public static <C> void transform(Collection<C> collection, public static <C> void transform(Collection<C> collection,
Transformer<? super C, ? extends C> transformer) { Transformer<? super C, ? extends C> transformer) {
if (collection != null && transformer != null) { if (collection != null && transformer != null) {
if (collection instanceof List) { if (collection instanceof List<?>) {
List<C> list = (List<C>) collection; List<C> list = (List<C>) collection;
for (ListIterator<C> it = list.listIterator(); it.hasNext();) { for (ListIterator<C> it = list.listIterator(); it.hasNext();) {
it.set(transformer.transform(it.next())); it.set(transformer.transform(it.next()));
@ -703,7 +703,7 @@ public class CollectionUtils {
* @param outputCollection the collection to output into, may not be null * @param outputCollection the collection to output into, may not be null
* @param <I> the type of object in the input collection * @param <I> the type of object in the input collection
* @param <O> the type of object in the output collection * @param <O> the type of object in the output collection
* @param <T> the output type of the transformer - this extends O. * @param <R> the output type of the transformer - this extends O.
* @return the outputCollection with the transformed input added * @return the outputCollection with the transformed input added
* @throws NullPointerException if the output collection is null * @throws NullPointerException if the output collection is null
*/ */
@ -727,7 +727,7 @@ public class CollectionUtils {
* @param outputCollection the collection to output into, may not be null * @param outputCollection the collection to output into, may not be null
* @param <I> the type of object in the input collection * @param <I> the type of object in the input collection
* @param <O> the type of object in the output collection * @param <O> the type of object in the output collection
* @param <T> the output type of the transformer - this extends O. * @param <R> the output type of the transformer - this extends O.
* @return the outputCollection with the transformed input added * @return the outputCollection with the transformed input added
* @throws NullPointerException if the output collection is null * @throws NullPointerException if the output collection is null
*/ */
@ -772,7 +772,7 @@ public class CollectionUtils {
* if the collection or iterator is null * if the collection or iterator is null
*/ */
public static <C> boolean addAll(Collection<C> collection, Iterable<? extends C> iterable) { public static <C> boolean addAll(Collection<C> collection, Iterable<? extends C> iterable) {
if (iterable instanceof Collection) { if (iterable instanceof Collection<?>) {
return collection.addAll((Collection<? extends C>) iterable); return collection.addAll((Collection<? extends C>) iterable);
} }
return addAll(collection, iterable.iterator()); return addAll(collection, iterable.iterator());
@ -879,7 +879,7 @@ public class CollectionUtils {
*/ */
public static <T> T get(Iterable<T> iterable, int index) { public static <T> T get(Iterable<T> iterable, int index) {
checkIndexBounds(index); checkIndexBounds(index);
if (iterable instanceof List) { if (iterable instanceof List<?>) {
return ((List<T>) iterable).get(index); return ((List<T>) iterable).get(index);
} }
return get(iterable.iterator(), index); return get(iterable.iterator(), index);
@ -920,13 +920,13 @@ public class CollectionUtils {
if (i < 0) { if (i < 0) {
throw new IndexOutOfBoundsException("Index cannot be negative: " + i); throw new IndexOutOfBoundsException("Index cannot be negative: " + i);
} }
if (object instanceof Map) { if (object instanceof Map<?,?>) {
Map<?, ?> map = (Map<?, ?>) object; Map<?, ?> map = (Map<?, ?>) object;
Iterator<?> iterator = map.entrySet().iterator(); Iterator<?> iterator = map.entrySet().iterator();
return get(iterator, i); return get(iterator, i);
} else if (object instanceof Object[]) { } else if (object instanceof Object[]) {
return ((Object[]) object)[i]; return ((Object[]) object)[i];
} else if (object instanceof Iterator) { } else if (object instanceof Iterator<?>) {
Iterator<?> it = (Iterator<?>) object; Iterator<?> it = (Iterator<?>) object;
while (it.hasNext()) { while (it.hasNext()) {
i--; i--;
@ -936,10 +936,10 @@ public class CollectionUtils {
it.next(); it.next();
} }
throw new IndexOutOfBoundsException("Entry does not exist: " + i); throw new IndexOutOfBoundsException("Entry does not exist: " + i);
} else if (object instanceof Collection) { } else if (object instanceof Collection<?>) {
Iterator<?> iterator = ((Collection<?>) object).iterator(); Iterator<?> iterator = ((Collection<?>) object).iterator();
return get(iterator, i); return get(iterator, i);
} else if (object instanceof Enumeration) { } else if (object instanceof Enumeration<?>) {
Enumeration<?> it = (Enumeration<?>) object; Enumeration<?> it = (Enumeration<?>) object;
while (it.hasMoreElements()) { while (it.hasMoreElements()) {
i--; i--;
@ -994,19 +994,19 @@ public class CollectionUtils {
*/ */
public static int size(Object object) { public static int size(Object object) {
int total = 0; int total = 0;
if (object instanceof Map) { if (object instanceof Map<?,?>) {
total = ((Map<?, ?>) object).size(); total = ((Map<?, ?>) object).size();
} else if (object instanceof Collection) { } else if (object instanceof Collection<?>) {
total = ((Collection<?>) object).size(); total = ((Collection<?>) object).size();
} else if (object instanceof Object[]) { } else if (object instanceof Object[]) {
total = ((Object[]) object).length; total = ((Object[]) object).length;
} else if (object instanceof Iterator) { } else if (object instanceof Iterator<?>) {
Iterator<?> it = (Iterator<?>) object; Iterator<?> it = (Iterator<?>) object;
while (it.hasNext()) { while (it.hasNext()) {
total++; total++;
it.next(); it.next();
} }
} else if (object instanceof Enumeration) { } else if (object instanceof Enumeration<?>) {
Enumeration<?> it = (Enumeration<?>) object; Enumeration<?> it = (Enumeration<?>) object;
while (it.hasMoreElements()) { while (it.hasMoreElements()) {
total++; total++;
@ -1045,15 +1045,15 @@ public class CollectionUtils {
* @since Commons Collections 3.2 * @since Commons Collections 3.2
*/ */
public static boolean sizeIsEmpty(Object object) { public static boolean sizeIsEmpty(Object object) {
if (object instanceof Collection) { if (object instanceof Collection<?>) {
return ((Collection<?>) object).isEmpty(); return ((Collection<?>) object).isEmpty();
} else if (object instanceof Map) { } else if (object instanceof Map<?, ?>) {
return ((Map<?, ?>) object).isEmpty(); return ((Map<?, ?>) object).isEmpty();
} else if (object instanceof Object[]) { } else if (object instanceof Object[]) {
return ((Object[]) object).length == 0; return ((Object[]) object).length == 0;
} else if (object instanceof Iterator) { } else if (object instanceof Iterator<?>) {
return ((Iterator<?>) object).hasNext() == false; return ((Iterator<?>) object).hasNext() == false;
} else if (object instanceof Enumeration) { } else if (object instanceof Enumeration<?>) {
return ((Enumeration<?>) object).hasMoreElements() == false; return ((Enumeration<?>) object).hasMoreElements() == false;
} else if (object == null) { } else if (object == null) {
throw new IllegalArgumentException("Unsupported object type: null"); throw new IllegalArgumentException("Unsupported object type: null");