From b147d16e647c9fa54b4ad14a76fd532906cec558 Mon Sep 17 00:00:00 2001 From: Henri Yandell Date: Sat, 15 Mar 2008 23:31:23 +0000 Subject: [PATCH] Removing tabs git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@637494 13f79535-47bb-0310-9956-ffa450edef68 --- .../collections/CursorableLinkedList.java | 28 +++++------ .../commons/collections/PredicateUtils.java | 2 +- .../comparators/NullComparator.java | 2 +- .../collections/iterators/ArrayIterator.java | 4 +- .../iterators/ArrayListIterator.java | 2 +- .../collections/iterators/IteratorChain.java | 2 +- .../iterators/ObjectArrayListIterator.java | 2 +- .../iterators/ObjectGraphIterator.java | 2 +- .../iterators/SingletonIterator.java | 2 +- .../commons/collections/map/CompositeMap.java | 48 +++++++++---------- 10 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/java/org/apache/commons/collections/CursorableLinkedList.java b/src/java/org/apache/commons/collections/CursorableLinkedList.java index 0abe4ed0f..bc420ca37 100644 --- a/src/java/org/apache/commons/collections/CursorableLinkedList.java +++ b/src/java/org/apache/commons/collections/CursorableLinkedList.java @@ -78,11 +78,11 @@ public class CursorableLinkedList implements List, Serializable { * @param element element to be inserted. * * @throws ClassCastException if the class of the specified element - * prevents it from being added to this list. + * prevents it from being added to this list. * @throws IllegalArgumentException if some aspect of the specified - * element prevents it from being added to this list. + * element prevents it from being added to this list. * @throws IndexOutOfBoundsException if the index is out of range - * (index < 0 || index > size()). + * (index < 0 || index > size()). */ public void add(int index, Object element) { if(index == _size) { @@ -109,7 +109,7 @@ public class CursorableLinkedList implements List, Serializable { * @return true if this list changed as a result of the call. * * @throws ClassCastException if the class of an element in the specified - * collection prevents it from being added to this list. + * collection prevents it from being added to this list. * @throws IllegalArgumentException if some aspect of an element in the * specified collection prevents it from being added to this * list. @@ -137,18 +137,18 @@ public class CursorableLinkedList implements List, Serializable { * collection is this list, and it's nonempty.) * * @param index index at which to insert first element from the specified - * collection. + * collection. * @param c elements to be inserted into this list. * @return true if this list changed as a result of the call. * * @throws ClassCastException if the class of one of elements of the - * specified collection prevents it from being added to this - * list. + * specified collection prevents it from being added to this + * list. * @throws IllegalArgumentException if some aspect of one of elements of * the specified collection prevents it from being added to * this list. * @throws IndexOutOfBoundsException if the index is out of range (index - * < 0 || index > size()). + * < 0 || index > size()). */ public boolean addAll(int index, Collection c) { if(c.isEmpty()) { @@ -291,7 +291,7 @@ public class CursorableLinkedList implements List, Serializable { * @see #listIterator(int) * @see CursorableLinkedList.Cursor * @throws IndexOutOfBoundsException if the index is out of range (index - * < 0 || index > size()). + * < 0 || index > size()). */ public CursorableLinkedList.Cursor cursor(int i) { return new Cursor(i); @@ -333,7 +333,7 @@ public class CursorableLinkedList implements List, Serializable { * @return the element at the specified position in this list. * * @throws IndexOutOfBoundsException if the index is out of range (index - * < 0 || index >= size()). + * < 0 || index >= size()). */ public Object get(int index) { return getListableAt(index).value(); @@ -450,7 +450,7 @@ public class CursorableLinkedList implements List, Serializable { * * @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. + * element, or -1 if this list does not contain this element. */ public int lastIndexOf(Object o) { int ndx = _size-1; @@ -617,11 +617,11 @@ public class CursorableLinkedList implements List, Serializable { * @return the element previously at the specified position. * * @throws ClassCastException if the class of the specified element - * prevents it from being added to this list. + * prevents it from being added to this list. * @throws IllegalArgumentException if some aspect of the specified - * element prevents it from being added to this list. + * element prevents it from being added to this list. * @throws IndexOutOfBoundsException if the index is out of range - * (index < 0 || index >= size()). + * (index < 0 || index >= size()). */ public Object set(int index, Object element) { Listable elt = getListableAt(index); diff --git a/src/java/org/apache/commons/collections/PredicateUtils.java b/src/java/org/apache/commons/collections/PredicateUtils.java index 9561d6b09..193637fad 100644 --- a/src/java/org/apache/commons/collections/PredicateUtils.java +++ b/src/java/org/apache/commons/collections/PredicateUtils.java @@ -527,7 +527,7 @@ public class PredicateUtils { * @param predicate the predicate to call with the result of the transform * @return the predicate * @throws IllegalArgumentException if the transformer or the predicate is null - * @since Commons Collections 3.1 + * @since Commons Collections 3.1 */ public static Predicate transformedPredicate(Transformer transformer, Predicate predicate) { return TransformedPredicate.getInstance(transformer, predicate); diff --git a/src/java/org/apache/commons/collections/comparators/NullComparator.java b/src/java/org/apache/commons/collections/comparators/NullComparator.java index b6cd8edf1..d52c6db3e 100644 --- a/src/java/org/apache/commons/collections/comparators/NullComparator.java +++ b/src/java/org/apache/commons/collections/comparators/NullComparator.java @@ -168,7 +168,7 @@ public class NullComparator implements Comparator, Serializable { if(!obj.getClass().equals(this.getClass())) { return false; } NullComparator other = (NullComparator)obj; - + return ((this.nullsAreHigh == other.nullsAreHigh) && (this.nonNullComparator.equals(other.nonNullComparator))); } diff --git a/src/java/org/apache/commons/collections/iterators/ArrayIterator.java b/src/java/org/apache/commons/collections/iterators/ArrayIterator.java index c81abd582..7f6e52d47 100644 --- a/src/java/org/apache/commons/collections/iterators/ArrayIterator.java +++ b/src/java/org/apache/commons/collections/iterators/ArrayIterator.java @@ -48,9 +48,9 @@ public class ArrayIterator implements ResettableIterator { /** The start index to loop from */ protected int startIndex = 0; /** The end index to loop to */ - protected int endIndex = 0; + protected int endIndex = 0; /** The current iterator index */ - protected int index = 0; + protected int index = 0; // Constructors // ---------------------------------------------------------------------- diff --git a/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java b/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java index 1567ee47c..75e29c28c 100644 --- a/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java +++ b/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java @@ -45,7 +45,7 @@ import org.apache.commons.collections.ResettableListIterator; * @author Phil Steitz */ public class ArrayListIterator extends ArrayIterator - implements ListIterator, ResettableListIterator { + implements ListIterator, ResettableListIterator { /** * Holds the index of the last item returned by a call to next() diff --git a/src/java/org/apache/commons/collections/iterators/IteratorChain.java b/src/java/org/apache/commons/collections/iterators/IteratorChain.java index 147e140a7..af348d674 100644 --- a/src/java/org/apache/commons/collections/iterators/IteratorChain.java +++ b/src/java/org/apache/commons/collections/iterators/IteratorChain.java @@ -50,7 +50,7 @@ import org.apache.commons.collections.list.UnmodifiableList; */ public class IteratorChain implements Iterator { - /** The chain of iterators */ + /** The chain of iterators */ protected final List iteratorChain = new ArrayList(); /** The index of the current iterator */ protected int currentIteratorIndex = 0; diff --git a/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java index c14810004..662a28c84 100644 --- a/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java +++ b/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java @@ -42,7 +42,7 @@ import org.apache.commons.collections.ResettableListIterator; * @author Phil Steitz */ public class ObjectArrayListIterator extends ObjectArrayIterator - implements ListIterator, ResettableListIterator { + implements ListIterator, ResettableListIterator { /** * Holds the index of the last item returned by a call to next() diff --git a/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java index 3c6039368..9f0da866a 100644 --- a/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java +++ b/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java @@ -79,7 +79,7 @@ public class ObjectGraphIterator implements Iterator { /** The stack of iterators */ protected final ArrayStack stack = new ArrayStack(8); - /** The root object in the tree */ + /** The root object in the tree */ protected Object root; /** The transformer to use */ protected Transformer transformer; diff --git a/src/java/org/apache/commons/collections/iterators/SingletonIterator.java b/src/java/org/apache/commons/collections/iterators/SingletonIterator.java index bd594c2fb..9726f4f63 100644 --- a/src/java/org/apache/commons/collections/iterators/SingletonIterator.java +++ b/src/java/org/apache/commons/collections/iterators/SingletonIterator.java @@ -33,7 +33,7 @@ import org.apache.commons.collections.ResettableIterator; * @author Rodney Waldhoff */ public class SingletonIterator - implements Iterator, ResettableIterator { + implements Iterator, ResettableIterator { /** Whether remove is allowed */ private final boolean removeAllowed; diff --git a/src/java/org/apache/commons/collections/map/CompositeMap.java b/src/java/org/apache/commons/collections/map/CompositeMap.java index c1a2f17ac..7fa3c460d 100644 --- a/src/java/org/apache/commons/collections/map/CompositeMap.java +++ b/src/java/org/apache/commons/collections/map/CompositeMap.java @@ -185,7 +185,7 @@ public class CompositeMap implements Map { * key. * * @throws ClassCastException if the key is of an inappropriate type for - * this map (optional). + * this map (optional). * @throws NullPointerException if the key is null and this map * does not not permit null keys (optional). */ @@ -210,7 +210,7 @@ public class CompositeMap implements Map { * @return true if this map maps one or more keys to the * specified value. * @throws ClassCastException if the value is of an inappropriate type for - * this map (optional). + * this map (optional). * @throws NullPointerException if the value is null and this map * does not not permit null values (optional). */ @@ -263,12 +263,12 @@ public class CompositeMap implements Map { * * @param key key whose associated value is to be returned. * @return the value to which this map maps the specified key, or - * null if the map contains no mapping for this key. + * null if the map contains no mapping for this key. * * @throws ClassCastException if the key is of an inappropriate type for - * this map (optional). + * this map (optional). * @throws NullPointerException key is null and this map does not - * not permit null keys (optional). + * not permit null keys (optional). * * @see #containsKey(Object) */ @@ -329,16 +329,16 @@ public class CompositeMap implements Map { * @param key key with which the specified value is to be associated. * @param value value to be associated with the specified key. * @return previous value associated with specified key, or null - * if there was no mapping for key. A null return can - * also indicate that the map previously associated null - * with the specified key, if the implementation supports - * null values. + * if there was no mapping for key. A null return can + * also indicate that the map previously associated null + * with the specified key, if the implementation supports + * null values. * * @throws UnsupportedOperationException if no MapMutator has been specified * @throws ClassCastException if the class of the specified key or value - * prevents it from being stored in this map. + * prevents it from being stored in this map. * @throws IllegalArgumentException if some aspect of this key or value - * prevents it from being stored in this map. + * prevents it from being stored in this map. * @throws NullPointerException this map does not permit null * keys or values, and the specified key or value is * null. @@ -361,13 +361,13 @@ public class CompositeMap implements Map { * @param map Mappings to be stored in this map. * * @throws UnsupportedOperationException if the putAll method is - * not supported by this map. + * not supported by this map. * * @throws ClassCastException if the class of a key or value in the - * specified map prevents it from being stored in this map. + * specified map prevents it from being stored in this map. * * @throws IllegalArgumentException some aspect of a key or value in the - * specified map prevents it from being stored in this map. + * specified map prevents it from being stored in this map. * @throws NullPointerException the specified map is null, or if * this map does not permit null keys or values, and the * specified map contains null keys or values. @@ -395,10 +395,10 @@ public class CompositeMap implements Map { * * @param key key whose mapping is to be removed from the map. * @return previous value associated with specified key, or null - * if there was no mapping for key. + * if there was no mapping for key. * * @throws ClassCastException if the key is of an inappropriate type for - * the composited map (optional). + * the composited map (optional). * @throws NullPointerException if the key is null and the composited map * does not not permit null keys (optional). * @throws UnsupportedOperationException if the remove method is @@ -501,16 +501,16 @@ public class CompositeMap implements Map { * @param key key with which the specified value is to be associated. * @param value value to be associated with the specified key. * @return previous value associated with specified key, or null - * if there was no mapping for key. A null return can - * also indicate that the map previously associated null - * with the specified key, if the implementation supports - * null values. + * if there was no mapping for key. A null return can + * also indicate that the map previously associated null + * with the specified key, if the implementation supports + * null values. * * @throws UnsupportedOperationException if not defined * @throws ClassCastException if the class of the specified key or value - * prevents it from being stored in this map. + * prevents it from being stored in this map. * @throws IllegalArgumentException if some aspect of this key or value - * prevents it from being stored in this map. + * prevents it from being stored in this map. * @throws NullPointerException this map does not permit null * keys or values, and the specified key or value is * null. @@ -526,9 +526,9 @@ public class CompositeMap implements Map { * * @throws UnsupportedOperationException if not defined * @throws ClassCastException if the class of the specified key or value - * prevents it from being stored in this map. + * prevents it from being stored in this map. * @throws IllegalArgumentException if some aspect of this key or value - * prevents it from being stored in this map. + * prevents it from being stored in this map. * @throws NullPointerException this map does not permit null * keys or values, and the specified key or value is * null.