diff --git a/src/java/org/apache/poi/util/DoubleList.java b/src/java/org/apache/poi/util/DoubleList.java
new file mode 100644
index 0000000000..bb5e13e1ae
--- /dev/null
+++ b/src/java/org/apache/poi/util/DoubleList.java
@@ -0,0 +1,677 @@
+/* ====================================================================
+ * 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 acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache POI" 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",
+ * "Apache POI", nor may "Apache" appear in their name, without
+ * prior written permission of the Apache Software Foundation.
+ *
+ * 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
+ *
+ * hashCode = 1;
+ * Iterator i = list.iterator();
+ * while (i.hasNext()) {
+ * Object obj = i.next();
+ * hashCode = 31*hashCode + (obj==null ? 0 : obj.hashCode());
+ * }
+ *
+ *
+ * This ensures that list1.equals(list2) implies that
+ * list1.hashCode()==list2.hashCode() for any two lists, list1 and
+ * list2, as required by the general contract of Object.hashCode.
+ *
+ * @return the hash code value for this list.
+ */
+
+ public int hashCode()
+ {
+ int hash = 0;
+
+ for (int j = 0; j < _limit; j++)
+ {
+ hash = (31 * hash) + ((int) _array[ j ]);
+ }
+ return hash;
+ }
+
+ /**
+ * Returns the index in this list of the first occurrence of the
+ * specified element, or -1 if this list does not contain this
+ * element. More formally, returns the lowest index i such that
+ * (o == get(i)), or -1 if there is no such index.
+ *
+ * @param o element to search for.
+ *
+ * @return the index in this list of the first occurrence of the
+ * specified element, or -1 if this list does not contain
+ * this element.
+ */
+
+ public int indexOf(final double o)
+ {
+ int rval = 0;
+
+ for (; rval < _limit; rval++)
+ {
+ if (o == _array[ rval ])
+ {
+ break;
+ }
+ }
+ if (rval == _limit)
+ {
+ rval = -1; // didn't find it
+ }
+ return rval;
+ }
+
+ /**
+ * Returns true if this list contains no elements.
+ *
+ * @return true if this list contains no elements.
+ */
+
+ public boolean isEmpty()
+ {
+ return _limit == 0;
+ }
+
+ /**
+ * Returns the index in this list of the last occurrence of the
+ * specified element, or -1 if this list does not contain this
+ * element. More formally, returns the highest index i such that
+ * (o == get(i)), or -1 if there is no such index.
+ *
+ * @param o element to search for.
+ *
+ * @return the index in this list of the last occurrence of the
+ * specified element, or -1 if this list does not contain
+ * this element.
+ */
+
+ public int lastIndexOf(final double o)
+ {
+ int rval = _limit - 1;
+
+ for (; rval >= 0; rval--)
+ {
+ if (o == _array[ rval ])
+ {
+ break;
+ }
+ }
+ return rval;
+ }
+
+ /**
+ * Removes the element at the specified position in this list.
+ * Shifts any subsequent elements to the left (subtracts one from
+ * their indices). Returns the element that was removed from the
+ * list.
+ *
+ * @param index the index of the element to removed.
+ *
+ * @return the element previously at the specified position.
+ *
+ * @exception IndexOutOfBoundsException if the index is out of
+ * range (index < 0 || index >= size()).
+ */
+
+ public double remove(final int index)
+ {
+ if (index >= _limit)
+ {
+ throw new IndexOutOfBoundsException();
+ }
+ double rval = _array[ index ];
+
+ System.arraycopy(_array, index + 1, _array, index, _limit - index);
+ _limit--;
+ return rval;
+ }
+
+ /**
+ * Removes the first occurrence in this list of the specified
+ * element (optional operation). If this list does not contain
+ * the element, it is unchanged. More formally, removes the
+ * element with the lowest index i such that (o.equals(get(i)))
+ * (if such an element exists).
+ *
+ * @param o element to be removed from this list, if present.
+ *
+ * @return true if this list contained the specified element.
+ */
+
+ public boolean removeValue(final double o)
+ {
+ boolean rval = false;
+
+ for (int j = 0; !rval && (j < _limit); j++)
+ {
+ if (o == _array[ j ])
+ {
+ System.arraycopy(_array, j + 1, _array, j, _limit - j);
+ _limit--;
+ rval = true;
+ }
+ }
+ return rval;
+ }
+
+ /**
+ * Removes from this list all the elements that are contained in
+ * the specified collection
+ *
+ * @param c collection that defines which elements will be removed
+ * from this list.
+ *
+ * @return true if this list changed as a result of the call.
+ */
+
+ public boolean removeAll(final DoubleList c)
+ {
+ boolean rval = false;
+
+ for (int j = 0; j < c._limit; j++)
+ {
+ if (removeValue(c._array[ j ]))
+ {
+ rval = true;
+ }
+ }
+ return rval;
+ }
+
+ /**
+ * Retains only the elements in this list that are contained in
+ * the specified collection. In other words, removes from this
+ * list all the elements that are not contained in the specified
+ * collection.
+ *
+ * @param c collection that defines which elements this set will
+ * retain.
+ *
+ * @return true if this list changed as a result of the call.
+ */
+
+ public boolean retainAll(final DoubleList c)
+ {
+ boolean rval = false;
+
+ for (int j = 0; j < _limit; )
+ {
+ if (!c.contains(_array[ j ]))
+ {
+ remove(j);
+ rval = true;
+ }
+ else
+ {
+ j++;
+ }
+ }
+ return rval;
+ }
+
+ /**
+ * Replaces the element at the specified position in this list
+ * with the specified element
+ *
+ * @param index index of element to replace.
+ * @param element element to be stored at the specified position.
+ *
+ * @return the element previously at the specified position.
+ *
+ * @exception IndexOutOfBoundsException if the index is out of
+ * range (index < 0 || index >= size()).
+ */
+
+ public double set(final int index, final double element)
+ {
+ if (index >= _limit)
+ {
+ throw new IndexOutOfBoundsException();
+ }
+ double rval = _array[ index ];
+
+ _array[ index ] = element;
+ return rval;
+ }
+
+ /**
+ * Returns the number of elements in this list. If this list
+ * contains more than Doubleeger.MAX_VALUE elements, returns
+ * Doubleeger.MAX_VALUE.
+ *
+ * @return the number of elements in this DoubleList
+ */
+
+ public int size()
+ {
+ return _limit;
+ }
+
+ /**
+ * Returns an array containing all of the elements in this list in
+ * proper sequence. Obeys the general contract of the
+ * Collection.toArray method.
+ *
+ * @return an array containing all of the elements in this list in
+ * proper sequence.
+ */
+
+ public double [] toArray()
+ {
+ double[] rval = new double[ _limit ];
+
+ System.arraycopy(_array, 0, rval, 0, _limit);
+ return rval;
+ }
+
+ /**
+ * Returns an array containing all of the elements in this list in
+ * proper sequence. Obeys the general contract of the
+ * Collection.toArray(Object[]) method.
+ *
+ * @param a the array into which the elements of this list are to
+ * be stored, if it is big enough; otherwise, a new array
+ * is allocated for this purpose.
+ *
+ * @return an array containing the elements of this list.
+ */
+
+ public double [] toArray(final double [] a)
+ {
+ double[] rval;
+
+ if (a.length == _limit)
+ {
+ System.arraycopy(_array, 0, a, 0, _limit);
+ rval = a;
+ }
+ else
+ {
+ rval = toArray();
+ }
+ return rval;
+ }
+
+ private void growArray(final int new_size)
+ {
+ int size = (new_size == _array.length) ? new_size + 1
+ : new_size;
+ double[] new_array = new double[ size ];
+
+ System.arraycopy(_array, 0, new_array, 0, _limit);
+ _array = new_array;
+ }
+} // end public class DoubleList
diff --git a/src/java/org/apache/poi/util/IntList.java b/src/java/org/apache/poi/util/IntList.java
index 3309cace5f..2669675d48 100644
--- a/src/java/org/apache/poi/util/IntList.java
+++ b/src/java/org/apache/poi/util/IntList.java
@@ -88,6 +88,7 @@ public class IntList
{
private int[] _array;
private int _limit;
+ private int fillval = 0;
private static final int _default_size = 128;
/**
@@ -97,8 +98,14 @@ public class IntList
public IntList()
{
this(_default_size);
- }
+ }
+ public IntList(final int initialCapacity)
+ {
+ this(initialCapacity,0);
+ }
+
+
/**
* create a copy of an existing IntList
*
@@ -118,12 +125,22 @@ public class IntList
* @param initialCapacity the size for the internal array
*/
- public IntList(final int initialCapacity)
+ public IntList(final int initialCapacity, int fillvalue)
{
_array = new int[ initialCapacity ];
+ if (fillval != 0) {
+ fillval = fillvalue;
+ fillArray(fillval, _array, 0);
+ }
_limit = 0;
}
+ private void fillArray(int val, int[] array, int index) {
+ for (int k = index; k < array.length; k++) {
+ array[k] = val;
+ }
+ }
+
/**
* add the specfied value at the specified index
*
@@ -519,7 +536,9 @@ public class IntList
{
if (o == _array[ j ])
{
- System.arraycopy(_array, j + 1, _array, j, _limit - j);
+ if (j+1 < _limit) {
+ System.arraycopy(_array, j + 1, _array, j, _limit - j);
+ }
_limit--;
rval = true;
}
@@ -670,7 +689,11 @@ public class IntList
int size = (new_size == _array.length) ? new_size + 1
: new_size;
int[] new_array = new int[ size ];
-
+
+ if (fillval != 0) {
+ fillArray(fillval, new_array, _array.length);
+ }
+
System.arraycopy(_array, 0, new_array, 0, _limit);
_array = new_array;
}