
2000-10-29 Bryce McKinlay <bryce@albatross.co.nz> * java/util/AbstractCollection.java (addAll): Use size() instead of hasNext() in iterator loop. (clear): Ditto. (contains): Ditto. Simplify loop. (containsAll): Ditto. (remove): Ditto. (removeAll): Ditto. (retainAll): Ditto. (toArray): Ditto. (toString): Ditto. Use string concatenation operators, not StringBuffer. * java/util/AbstractList.java (addAll): Use size() instead of hasNext() in iterator loop. (equals): Ditto. (hashCode): Ditto. (indexOf): Ditto. Don't take null check outside of the loop. (iterator): Return an AbstractListItr instead of anonymous class. (lastIndexOf): Use a for loop bounded by size() instead of hasPrevious() in iterator loop. (listIterator): Return an AbstractListItr. (removeRange): Remove bounds checking code and docs. (AbstractListItr): New inner class. Code moved here from listIterator(). (SubList.iterator): Removed. Use default implementation from AbstractList instead. (SubList.listIterator): As above. * java/util/AbstractMap.java (clear): Use a for loop bounded by size() instead of hasNext() in iterator loop. (containsValue): Ditto. (equals): Ditto. (get): Ditto. (put): Ditto. (putAll): Ditto. (remove): Ditto. (toString): Ditto. Use string concatenation operators, not StringBuffer. * java/util/AbstractSequentialList.java (addAll): Use a for loop bounded by size() instead of hasNext() in iterator loop. * java/util/AbstractSet.java (hashCode): Don't catch exception as part of normal execution flow. Do an explicit null check instead. * java/util/ArrayList.java (_iSize): Rename to `size'. (_arData): Rename to `data'. (get): Check lower bounds also. Simplify IndexOutOfBoundsException message. (remove): Ditto. (removeRange): Make protected. Don't check bounds. (add): Check lower bounds also. Simplify IndexOutOfBoundsException message. (addAll (Collection)): Use a size-bounded for loop instead of hasNext() check. (addAll (int, Collection)): Check lower bounds. Simplify exception string. (clone): Clone the data array too. (indexOf): Inline doesEqual(). (lastIndexOf): Ditto. (clear): Don't set array data to null. (set): Check lower bounds. Simplify exception string. (toArray): Correct comment. (trimToSize): Don't update modCount, this is not a structural change. Add comment. * java/util/BitSet.java: Merged with classpath, new JDK 1.2 methods implemented. (toString): Declare `bit' as long, not int. (data): Made package-private, not private. From-SVN: r37116
118 lines
3.6 KiB
Java
118 lines
3.6 KiB
Java
/* AbstractSequentialList.java -- List implementation for sequential access
|
|
Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
As a special exception, if you link this library with other files to
|
|
produce an executable, this library does not by itself cause the
|
|
resulting executable to be covered by the GNU General Public License.
|
|
This exception does not however invalidate any other reasons why the
|
|
executable file might be covered by the GNU General Public License. */
|
|
|
|
|
|
// TO DO:
|
|
// ~ Lots of doc comments still missing.
|
|
// ~ The class comment should include a description of what should be overridden
|
|
// to provide what features, as should the listIterator comment.
|
|
|
|
package java.util;
|
|
|
|
/**
|
|
* Abstract superclass to make it easier to implement the List interface when
|
|
* backed by a sequential-access store, such as a linked list.
|
|
*/
|
|
public abstract class AbstractSequentialList extends AbstractList
|
|
{
|
|
|
|
/**
|
|
* Returns a ListIterator over the list, starting from position index.
|
|
* Subclasses must provide an implementation of this method.
|
|
*
|
|
* @exception IndexOutOfBoundsException if index < 0 || index > size()
|
|
*/
|
|
public abstract ListIterator listIterator(int index);
|
|
|
|
/**
|
|
* Add an element to the list at a given index. This implementation obtains a
|
|
* ListIterator positioned at the specified index, and then adds the element
|
|
* using the ListIterator's add method.
|
|
*
|
|
* @param index the position to add the element
|
|
* @param o the element to insert
|
|
* @exception IndexOutOfBoundsException if index < 0 || index > size()
|
|
* @exception UnsupportedOperationException if the iterator returned by
|
|
* listIterator(index) does not support the add method.
|
|
*/
|
|
public void add(int index, Object o)
|
|
{
|
|
ListIterator i = listIterator(index);
|
|
i.add(o);
|
|
}
|
|
|
|
public boolean addAll(int index, Collection c)
|
|
{
|
|
boolean modified = false;
|
|
Iterator ci = c.iterator();
|
|
int size = c.size();
|
|
ListIterator i = listIterator(index);
|
|
for (int pos = 0; pos < size; pos++)
|
|
{
|
|
i.add(ci.next());
|
|
}
|
|
return (size > 0);
|
|
}
|
|
|
|
public Object get(int index)
|
|
{
|
|
ListIterator i = listIterator(index);
|
|
if (index < 0 || index > size())
|
|
throw new IndexOutOfBoundsException();
|
|
return i.next();
|
|
}
|
|
|
|
/**
|
|
* Return an Iterator over this List. This implementation returns
|
|
* listIterator().
|
|
*
|
|
* @return an Iterator over this List
|
|
*/
|
|
public Iterator iterator()
|
|
{
|
|
return listIterator();
|
|
}
|
|
|
|
public Object remove(int index)
|
|
{
|
|
ListIterator i = listIterator(index);
|
|
if (index < 0 || index > size())
|
|
throw new IndexOutOfBoundsException();
|
|
Object removed = i.next();
|
|
i.remove();
|
|
return removed;
|
|
}
|
|
|
|
public Object set(int index, Object o)
|
|
{
|
|
ListIterator i = listIterator(index);
|
|
if (index < 0 || index > size())
|
|
throw new IndexOutOfBoundsException();
|
|
Object old = i.next();
|
|
i.set(o);
|
|
return old;
|
|
}
|
|
}
|