Author: scolebourne
Date: Sat Nov 4 06:04:46 2006
New Revision: 471192
URL: http://svn.apache.org/viewvc?view=rev&rev=471192
Log:
Remove getList() - use decorated()
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/AbstractListDecorator.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/FixedSizeList.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/GrowthList.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/LazyList.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/UnmodifiableList.java
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/AbstractListDecorator.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/AbstractListDecorator.java?view=diff&rev=471192&r1=471191&r2=471192
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/AbstractListDecorator.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/AbstractListDecorator.java
Sat Nov 4 06:04:46 2006
@@ -59,16 +59,6 @@
* Gets the list being decorated.
*
* @return the decorated list
- * @deprecated use decorated()
- */
- protected List<E> getList() {
- return decorated();
- }
-
- /**
- * Gets the list being decorated.
- *
- * @return the decorated list
*/
protected List<E> decorated() {
return (List<E>) super.decorated();
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/FixedSizeList.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/FixedSizeList.java?view=diff&rev=471192&r1=471191&r2=471192
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/FixedSizeList.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/FixedSizeList.java
Sat Nov 4 06:04:46 2006
@@ -89,27 +89,27 @@
}
public Object get(int index) {
- return getList().get(index);
+ return decorated().get(index);
}
public int indexOf(Object object) {
- return getList().indexOf(object);
+ return decorated().indexOf(object);
}
public Iterator iterator() {
- return UnmodifiableIterator.decorate(getCollection().iterator());
+ return UnmodifiableIterator.decorate(decorated().iterator());
}
public int lastIndexOf(Object object) {
- return getList().lastIndexOf(object);
+ return decorated().lastIndexOf(object);
}
public ListIterator listIterator() {
- return new FixedSizeListIterator(getList().listIterator(0));
+ return new FixedSizeListIterator(decorated().listIterator(0));
}
public ListIterator listIterator(int index) {
- return new FixedSizeListIterator(getList().listIterator(index));
+ return new FixedSizeListIterator(decorated().listIterator(index));
}
public Object remove(int index) {
@@ -129,11 +129,11 @@
}
public Object set(int index, Object object) {
- return getList().set(index, object);
+ return decorated().set(index, object);
}
public List subList(int fromIndex, int toIndex) {
- List sub = getList().subList(fromIndex, toIndex);
+ List sub = decorated().subList(fromIndex, toIndex);
return new FixedSizeList(sub);
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/GrowthList.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/GrowthList.java?view=diff&rev=471192&r1=471191&r2=471192
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/GrowthList.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/GrowthList.java
Sat Nov 4 06:04:46 2006
@@ -118,11 +118,11 @@
* @throws IllegalArgumentException if the underlying list rejects the
element
*/
public void add(int index, Object element) {
- int size = getList().size();
+ int size = decorated().size();
if (index > size) {
- getList().addAll(Collections.nCopies(index - size, null));
+ decorated().addAll(Collections.nCopies(index - size, null));
}
- getList().add(index, element);
+ decorated().add(index, element);
}
//-----------------------------------------------------------------------
@@ -146,13 +146,13 @@
* @throws IllegalArgumentException if the underlying list rejects the
element
*/
public boolean addAll(int index, Collection coll) {
- int size = getList().size();
+ int size = decorated().size();
boolean result = false;
if (index > size) {
- getList().addAll(Collections.nCopies(index - size, null));
+ decorated().addAll(Collections.nCopies(index - size, null));
result = true;
}
- return (getList().addAll(index, coll) | result);
+ return (decorated().addAll(index, coll) | result);
}
//-----------------------------------------------------------------------
@@ -176,11 +176,11 @@
* @throws IllegalArgumentException if the underlying list rejects the
element
*/
public Object set(int index, Object element) {
- int size = getList().size();
+ int size = decorated().size();
if (index >= size) {
- getList().addAll(Collections.nCopies((index - size) + 1, null));
+ decorated().addAll(Collections.nCopies((index - size) + 1, null));
}
- return getList().set(index, element);
+ return decorated().set(index, element);
}
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/LazyList.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/LazyList.java?view=diff&rev=471192&r1=471191&r2=471192
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/LazyList.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/LazyList.java
Sat Nov 4 06:04:46 2006
@@ -108,14 +108,14 @@
* @param index the index to retrieve
*/
public Object get(int index) {
- int size = getList().size();
+ int size = decorated().size();
if (index < size) {
// within bounds, get the object
- Object object = getList().get(index);
+ Object object = decorated().get(index);
if (object == null) {
// item is a place holder, create new one, set and return
object = factory.create();
- getList().set(index, object);
+ decorated().set(index, object);
return object;
} else {
// good and ready to go
@@ -124,18 +124,18 @@
} else {
// we have to grow the list
for (int i = size; i < index; i++) {
- getList().add(null);
+ decorated().add(null);
}
// create our last object, set and return
Object object = factory.create();
- getList().add(object);
+ decorated().add(object);
return object;
}
}
public List subList(int fromIndex, int toIndex) {
- List sub = getList().subList(fromIndex, toIndex);
+ List sub = decorated().subList(fromIndex, toIndex);
return new LazyList(sub, factory);
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/UnmodifiableList.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/UnmodifiableList.java?view=diff&rev=471192&r1=471191&r2=471192
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/UnmodifiableList.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/UnmodifiableList.java
Sat Nov 4 06:04:46 2006
@@ -97,11 +97,11 @@
//-----------------------------------------------------------------------
public ListIterator listIterator() {
- return UnmodifiableListIterator.decorate(getList().listIterator());
+ return UnmodifiableListIterator.decorate(decorated().listIterator());
}
public ListIterator listIterator(int index) {
- return
UnmodifiableListIterator.decorate(getList().listIterator(index));
+ return
UnmodifiableListIterator.decorate(decorated().listIterator(index));
}
public void add(int index, Object object) {
@@ -121,7 +121,7 @@
}
public List subList(int fromIndex, int toIndex) {
- List sub = getList().subList(fromIndex, toIndex);
+ List sub = decorated().subList(fromIndex, toIndex);
return new UnmodifiableList(sub);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
