AfflictionNetworks/samskivert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Change ReplacedBy values...

Browse Source 
- CollectionUtil.limit doesn't need to know the Collection type.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2766 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
ray.j.greenwell
2010-03-31 21:11:08 +00:00
parent a4d53dcbb8
commit dc4bbffb48
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/samskivert/util/CollectionUtil.java
+9 -9
View File
@@ -39,6 +39,7 @@ public class CollectionUtil
* Adds all items returned by the enumeration to the supplied collection * Adds all items returned by the enumeration to the supplied collection
* and returns the supplied collection. * and returns the supplied collection.
*/ */
@ReplacedBy("com.google.common.collect.Iterators#addAll(Collection, com.google.common.collect.Iterators#forEnumeration(Enumeration))")
public static <T, C extends Collection<T>> C addAll (C col, Enumeration<? extends T> enm) public static <T, C extends Collection<T>> C addAll (C col, Enumeration<? extends T> enm)
{ {
while (enm.hasMoreElements()) { while (enm.hasMoreElements()) {
@@ -51,7 +52,7 @@ public class CollectionUtil
* Adds all items returned by the iterator to the supplied collection and * Adds all items returned by the iterator to the supplied collection and
* returns the supplied collection. * returns the supplied collection.
*/ */
@ReplacedBy("com.google.common.collect.Iterators.addAll()") @ReplacedBy("com.google.common.collect.Iterators#addAll()")
public static <T, C extends Collection<T>> C addAll (C col, Iterator<? extends T> iter) public static <T, C extends Collection<T>> C addAll (C col, Iterator<? extends T> iter)
{ {
while (iter.hasNext()) { while (iter.hasNext()) {
@@ -65,7 +66,7 @@ public class CollectionUtil
* returns the supplied collection. If the supplied array is null, nothing * returns the supplied collection. If the supplied array is null, nothing
* is added to the collection. * is added to the collection.
*/ */
@ReplacedBy("java.util.Collections.addAll()") @ReplacedBy("java.util.Collections#addAll()")
public static <T, E extends T, C extends Collection<T>> C addAll (C col, E[] values) public static <T, E extends T, C extends Collection<T>> C addAll (C col, E[] values)
{ {
if (values != null) { if (values != null) {
@@ -81,7 +82,7 @@ public class CollectionUtil
* remain, as determined by iteration order. If the Collection is smaller than limit, * remain, as determined by iteration order. If the Collection is smaller than limit,
* it is unmodified. * it is unmodified.
*/ */
public static <T> void limit (Collection<T> col, int limit) public static void limit (Collection<?> col, int limit)
{ {
int size = col.size(); int size = col.size();
if (size > limit) { if (size > limit) {
@@ -89,12 +90,11 @@ public class CollectionUtil
((List<?>) col).subList(limit, size).clear(); ((List<?>) col).subList(limit, size).clear();
} else { } else {
Iterator<T> itr = col.iterator(); Iterator<?> itr = col.iterator();
int ii = 0; for (int ii = 0; ii < limit; ii++) {
for (; ii < limit; ii++) {
itr.next(); itr.next();
} }
for (; ii < size; ii++) { while (itr.hasNext()) {
itr.next(); itr.next();
itr.remove(); itr.remove();
} }
@@ -156,7 +156,7 @@ public class CollectionUtil
* Returns an Array, of the type specified by the runtime-type token <code>type</code>, * Returns an Array, of the type specified by the runtime-type token <code>type</code>,
* containing the elements of the collection. * containing the elements of the collection.
*/ */
@ReplacedBy("com.google.common.collect.Iterables.toArray()") @ReplacedBy("com.google.common.collect.Iterables#toArray()")
public static <T> T[] toArray (Collection<? extends T> col, Class<T> type) public static <T> T[] toArray (Collection<? extends T> col, Class<T> type)
{ {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@@ -174,7 +174,7 @@ public class CollectionUtil
* order returned by the collection's iterator). The size of the array will * order returned by the collection's iterator). The size of the array will
* be equal to the size of the collection. * be equal to the size of the collection.
*/ */
@ReplacedBy("com.google.common.primitives.Ints.toArray()") @ReplacedBy("com.google.common.primitives.Ints#toArray()")
public static int[] toIntArray (Collection<Integer> col) public static int[] toIntArray (Collection<Integer> col)
{ {
Iterator<Integer> iter = col.iterator(); Iterator<Integer> iter = col.iterator();
src/java/com/samskivert/util/Collections.java
+2 -2
View File
@@ -38,7 +38,7 @@ public class Collections
* *
* @param metaIterable an iterable of Iterators. * @param metaIterable an iterable of Iterators.
*/ */
@ReplacedBy("com.google.common.collect.Iterators.concat() or com.google.common.collect.Iterables.concat()") @ReplacedBy("com.google.common.collect.Iterators#concat() or com.google.common.collect.Iterables#concat()")
public static <T> Iterator<T> getMetaIterator (Iterable<Iterator<T>> metaIterable) public static <T> Iterator<T> getMetaIterator (Iterable<Iterator<T>> metaIterable)
{ {
return new MetaIterator<T>(metaIterable); return new MetaIterator<T>(metaIterable);
@@ -139,7 +139,7 @@ public class Collections
/** /**
* Get an iterator that returns the same elements as the supplied iterator but blocks removal. * Get an iterator that returns the same elements as the supplied iterator but blocks removal.
*/ */
@ReplacedBy("com.google.common.collect.Iterators.unmodifiableIterator") @ReplacedBy("com.google.common.collect.Iterators#unmodifiableIterator()")
public static <T> Iterator<T> getUnmodifiableIterator (final Iterator<T> itr) public static <T> Iterator<T> getUnmodifiableIterator (final Iterator<T> itr)
{ {
return new Iterator<T>() { return new Iterator<T>() {