diff --git a/src/java/org/apache/commons/collections/primitives/CollectionIntCollection.java b/src/java/org/apache/commons/collections/primitives/CollectionIntCollection.java
new file mode 100644
index 000000000..6e1d6ada8
--- /dev/null
+++ b/src/java/org/apache/commons/collections/primitives/CollectionIntCollection.java
@@ -0,0 +1,157 @@
+/*
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/CollectionIntCollection.java,v 1.1 2003/01/05 03:03:42 rwaldhoff Exp $
+ * $Revision: 1.1 $
+ * $Date: 2003/01/05 03:03:42 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * .
+ *
+ */
+
+package org.apache.commons.collections.primitives;
+
+import java.util.Collection;
+
+/**
+ * Adapts a {@link java.lang.Number Number} valued
+ * {@link java.util.Collection Collection} to the
+ * {@link IntCollection} interface.
+ *
+ * @version $Revision: 1.1 $ $Date: 2003/01/05 03:03:42 $
+ * @author Rodney Waldhoff
+ */
+public class CollectionIntCollection implements IntCollection {
+ public CollectionIntCollection(Collection collection) {
+ _collection = collection;
+ }
+
+ public boolean add(int element) {
+ return _collection.add(new Integer(element));
+ }
+
+ public boolean addAll(IntCollection c) {
+ return _collection.addAll(IntCollectionCollection.wrap(c));
+ }
+
+ public void clear() {
+ _collection.clear();
+ }
+
+ public boolean contains(int element) {
+ return _collection.contains(new Integer(element));
+ }
+
+ public boolean containsAll(IntCollection c) {
+ return _collection.containsAll(IntCollectionCollection.wrap(c));
+ }
+
+ public boolean equals(Object o) {
+ return _collection.equals(o);
+ }
+
+ public int hashCode() {
+ return _collection.hashCode();
+ }
+
+ public boolean isEmpty() {
+ return _collection.isEmpty();
+ }
+
+ public IntIterator iterator() {
+ return IteratorIntIterator.wrap(_collection.iterator());
+ }
+
+ public boolean removeElement(int element) {
+ return _collection.remove(new Integer(element));
+ }
+
+ public boolean removeAll(IntCollection c) {
+ return _collection.removeAll(IntCollectionCollection.wrap(c));
+ }
+
+ public boolean retainAll(IntCollection c) {
+ return _collection.retainAll(IntCollectionCollection.wrap(c));
+ }
+
+ public int size() {
+ return _collection.size();
+ }
+
+ public int[] toArray() {
+ Object[] src = _collection.toArray();
+ int[] dest = new int[src.length];
+ for(int i=0;i.
+ *
+ */
+
+package org.apache.commons.collections.primitives;
+
+import java.lang.reflect.Array;
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * Adapts an {@link IntCollection} to the
+ * {@link java.util.Collection Collection} interface.
+ *
+ * @version $Revision: 1.1 $ $Date: 2003/01/05 03:03:42 $
+ * @author Rodney Waldhoff
+ */
+public class IntCollectionCollection implements Collection {
+
+ public IntCollectionCollection(IntCollection collection) {
+ _collection = collection;
+ }
+
+ public boolean add(Object element) {
+ return _collection.add(((Number)element).intValue());
+ }
+
+ public boolean addAll(Collection c) {
+ return _collection.addAll(CollectionIntCollection.wrap(c));
+ }
+
+ public void clear() {
+ _collection.clear();
+ }
+
+ public boolean contains(Object element) {
+ return _collection.contains(((Number)element).intValue());
+ }
+
+
+ public boolean containsAll(Collection c) {
+ return _collection.containsAll(CollectionIntCollection.wrap(c));
+ }
+
+ public boolean equals(Object o) {
+ return _collection.equals(o);
+ }
+
+ public int hashCode() {
+ return _collection.hashCode();
+ }
+
+ public boolean isEmpty() {
+ return _collection.isEmpty();
+ }
+
+ public Iterator iterator() {
+ return IntIteratorIterator.wrap(_collection.iterator());
+ }
+
+ public boolean remove(Object element) {
+ return _collection.removeElement(((Number)element).intValue());
+ }
+
+ public boolean removeAll(Collection c) {
+ return _collection.removeAll(CollectionIntCollection.wrap(c));
+ }
+
+ public boolean retainAll(Collection c) {
+ return _collection.removeAll(CollectionIntCollection.wrap(c));
+ }
+
+ public int size() {
+ return _collection.size();
+ }
+
+ public Object[] toArray() {
+ int[] a = _collection.toArray();
+ Object[] A = new Object[a.length];
+ for(int i=0;i a.length) {
+ A[a.length] = null;
+ }
+
+ return A;
+ }
+
+ public static Collection wrap(IntCollection collection) {
+ return null == collection ? null : new IntCollectionCollection(collection);
+ }
+
+ private IntCollection _collection = null;
+}
diff --git a/src/java/org/apache/commons/collections/primitives/IntIteratorIterator.java b/src/java/org/apache/commons/collections/primitives/IntIteratorIterator.java
new file mode 100644
index 000000000..e878209cd
--- /dev/null
+++ b/src/java/org/apache/commons/collections/primitives/IntIteratorIterator.java
@@ -0,0 +1,97 @@
+/*
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/IntIteratorIterator.java,v 1.1 2003/01/05 03:03:42 rwaldhoff Exp $
+ * $Revision: 1.1 $
+ * $Date: 2003/01/05 03:03:42 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * .
+ *
+ */
+
+package org.apache.commons.collections.primitives;
+
+import java.util.Iterator;
+
+/**
+ * Adapts an {@link IntIterator} to the
+ * {@link java.util.Iterator Iterator} interface.
+ *
+ * @version $Revision: 1.1 $ $Date: 2003/01/05 03:03:42 $
+ * @author Rodney Waldhoff
+ */
+public class IntIteratorIterator implements Iterator {
+
+ public IntIteratorIterator(IntIterator iterator) {
+ _iterator = iterator;
+ }
+
+ public boolean hasNext() {
+ return _iterator.hasNext();
+ }
+
+ public Object next() {
+ return new Integer(_iterator.next());
+ }
+
+ public void remove() {
+ _iterator.remove();
+ }
+
+ public static Iterator wrap(IntIterator iterator) {
+ return null == iterator ? null : new IntIteratorIterator(iterator);
+ }
+
+ private IntIterator _iterator = null;
+
+}
diff --git a/src/java/org/apache/commons/collections/primitives/IteratorIntIterator.java b/src/java/org/apache/commons/collections/primitives/IteratorIntIterator.java
new file mode 100644
index 000000000..78fbfe922
--- /dev/null
+++ b/src/java/org/apache/commons/collections/primitives/IteratorIntIterator.java
@@ -0,0 +1,99 @@
+/*
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/IteratorIntIterator.java,v 1.1 2003/01/05 03:03:42 rwaldhoff Exp $
+ * $Revision: 1.1 $
+ * $Date: 2003/01/05 03:03:42 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * .
+ *
+ */
+
+package org.apache.commons.collections.primitives;
+
+import java.util.Iterator;
+
+/**
+ * Adapts a {@link java.lang.Number Number}-valued
+ * {@link java.util.Iterator Iterator}
+ * to the {@link IntIterator} interface.
+ *
+ * @version $Revision: 1.1 $ $Date: 2003/01/05 03:03:42 $
+ * @author Rodney Waldhoff
+ *
+ */
+public class IteratorIntIterator implements IntIterator {
+
+ public IteratorIntIterator(Iterator iterator) {
+ _iterator = iterator;
+ }
+
+ public boolean hasNext() {
+ return _iterator.hasNext();
+ }
+
+ public int next() {
+ return ((Number)(_iterator.next())).intValue();
+ }
+
+ public void remove() {
+ _iterator.remove();
+ }
+
+ public static IntIterator wrap(Iterator iterator) {
+ return null == iterator ? null : new IteratorIntIterator(iterator);
+ }
+
+ private Iterator _iterator = null;
+
+}