Merged gcj-eclipse branch to trunk.
From-SVN: r120621
This commit is contained in:
parent
c648dedbde
commit
97b8365caf
17478 changed files with 606493 additions and 100744 deletions
|
@ -1,5 +1,5 @@
|
|||
/* AbstractSequentialList.java -- List implementation for sequential access
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
|
@ -71,7 +71,7 @@ package java.util;
|
|||
* @since 1.2
|
||||
* @status updated to 1.4
|
||||
*/
|
||||
public abstract class AbstractSequentialList extends AbstractList
|
||||
public abstract class AbstractSequentialList<E> extends AbstractList<E>
|
||||
{
|
||||
/**
|
||||
* The main constructor, for use by subclasses.
|
||||
|
@ -88,7 +88,7 @@ public abstract class AbstractSequentialList extends AbstractList
|
|||
* @return the list iterator
|
||||
* @throws IndexOutOfBoundsException if index < 0 || index > size()
|
||||
*/
|
||||
public abstract ListIterator listIterator(int index);
|
||||
public abstract ListIterator<E> listIterator(int index);
|
||||
|
||||
/**
|
||||
* Insert an element into the list at a given position (optional operation).
|
||||
|
@ -109,7 +109,7 @@ public abstract class AbstractSequentialList extends AbstractList
|
|||
* @throws NullPointerException if o is null and the list does not permit
|
||||
* the addition of null values.
|
||||
*/
|
||||
public void add(int index, Object o)
|
||||
public void add(int index, E o)
|
||||
{
|
||||
listIterator(index).add(o);
|
||||
}
|
||||
|
@ -143,11 +143,11 @@ public abstract class AbstractSequentialList extends AbstractList
|
|||
* does not permit the addition of null values.
|
||||
* @see #add(int, Object)
|
||||
*/
|
||||
public boolean addAll(int index, Collection c)
|
||||
public boolean addAll(int index, Collection<? extends E> c)
|
||||
{
|
||||
Iterator ci = c.iterator();
|
||||
Iterator<? extends E> ci = c.iterator();
|
||||
int size = c.size();
|
||||
ListIterator i = listIterator(index);
|
||||
ListIterator<E> i = listIterator(index);
|
||||
for (int pos = size; pos > 0; pos--)
|
||||
i.add(ci.next());
|
||||
return size > 0;
|
||||
|
@ -161,7 +161,7 @@ public abstract class AbstractSequentialList extends AbstractList
|
|||
* @return the element at index index in this list
|
||||
* @throws IndexOutOfBoundsException if index < 0 || index >= size()
|
||||
*/
|
||||
public Object get(int index)
|
||||
public E get(int index)
|
||||
{
|
||||
// This is a legal listIterator position, but an illegal get.
|
||||
if (index == size())
|
||||
|
@ -176,7 +176,7 @@ public abstract class AbstractSequentialList extends AbstractList
|
|||
*
|
||||
* @return an Iterator over the elements of this list, in order
|
||||
*/
|
||||
public Iterator iterator()
|
||||
public Iterator<E> iterator()
|
||||
{
|
||||
return listIterator();
|
||||
}
|
||||
|
@ -192,14 +192,14 @@ public abstract class AbstractSequentialList extends AbstractList
|
|||
* remove operation
|
||||
* @throws IndexOutOfBoundsException if index < 0 || index >= size()
|
||||
*/
|
||||
public Object remove(int index)
|
||||
public E remove(int index)
|
||||
{
|
||||
// This is a legal listIterator position, but an illegal remove.
|
||||
if (index == size())
|
||||
throw new IndexOutOfBoundsException("Index: " + index + ", Size:"
|
||||
+ size());
|
||||
ListIterator i = listIterator(index);
|
||||
Object removed = i.next();
|
||||
ListIterator<E> i = listIterator(index);
|
||||
E removed = i.next();
|
||||
i.remove();
|
||||
return removed;
|
||||
}
|
||||
|
@ -221,14 +221,14 @@ public abstract class AbstractSequentialList extends AbstractList
|
|||
* @throws NullPointerException if o is null and the list does not allow
|
||||
* a value to be set to null.
|
||||
*/
|
||||
public Object set(int index, Object o)
|
||||
public E set(int index, E o)
|
||||
{
|
||||
// This is a legal listIterator position, but an illegal set.
|
||||
if (index == size())
|
||||
throw new IndexOutOfBoundsException("Index: " + index + ", Size:"
|
||||
+ size());
|
||||
ListIterator i = listIterator(index);
|
||||
Object old = i.next();
|
||||
ListIterator<E> i = listIterator(index);
|
||||
E old = i.next();
|
||||
i.set(o);
|
||||
return old;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue