From 92e8f95b6ae3c3ab76f7ea3b3d60def984ad7740 Mon Sep 17 00:00:00 2001 From: Sebastian Bazley Date: Sat, 10 Mar 2012 17:01:13 +0000 Subject: [PATCH] Tab police git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1299233 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/collections/TransformerUtils.java | 2 +- .../collections/bag/TransformedBag.java | 2 +- .../collections/bag/UnmodifiableBag.java | 6 +- .../UnmodifiableBoundedCollection.java | 2 +- .../collections/functors/DefaultEquator.java | 68 +++++++++---------- .../commons/collections/map/TestLRUMap.java | 8 +-- 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/main/java/org/apache/commons/collections/TransformerUtils.java b/src/main/java/org/apache/commons/collections/TransformerUtils.java index ac656c554..f67a6db78 100644 --- a/src/main/java/org/apache/commons/collections/TransformerUtils.java +++ b/src/main/java/org/apache/commons/collections/TransformerUtils.java @@ -192,7 +192,7 @@ public class TransformerUtils { * @throws IllegalArgumentException if either transformer is null */ @SuppressWarnings("unchecked") - public static Transformer chainedTransformer( + public static Transformer chainedTransformer( Transformer transformer1, Transformer transformer2) { return ChainedTransformer. chainedTransformer(transformer1, transformer2); diff --git a/src/main/java/org/apache/commons/collections/bag/TransformedBag.java b/src/main/java/org/apache/commons/collections/bag/TransformedBag.java index 9bc120c7e..5415ba569 100644 --- a/src/main/java/org/apache/commons/collections/bag/TransformedBag.java +++ b/src/main/java/org/apache/commons/collections/bag/TransformedBag.java @@ -80,7 +80,7 @@ public class TransformedBag @SuppressWarnings("unchecked") // Bag is of type E E[] values = (E[]) bag.toArray(); bag.clear(); - for (int i = 0; i < values.length; i++) { + for (int i = 0; i < values.length; i++) { decorated.decorated().add(transformer.transform(values[i])); } } diff --git a/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java b/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java index 635710919..c63bbd3f5 100644 --- a/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java +++ b/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java @@ -102,8 +102,8 @@ public final class UnmodifiableBag //----------------------------------------------------------------------- @Override public Iterator iterator() { - return UnmodifiableIterator. unmodifiableIterator(decorated() - .iterator()); + return UnmodifiableIterator. unmodifiableIterator(decorated() + .iterator()); } @Override @@ -150,7 +150,7 @@ public final class UnmodifiableBag @Override public Set uniqueSet() { Set set = decorated().uniqueSet(); - return UnmodifiableSet. unmodifiableSet(set); + return UnmodifiableSet. unmodifiableSet(set); } } diff --git a/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java b/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java index 54daa54da..63502336a 100644 --- a/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java +++ b/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java @@ -69,7 +69,7 @@ public final class UnmodifiableBoundedCollection extends AbstractCollectionDe * @throws IllegalArgumentException if bag is null */ @SuppressWarnings("unchecked") - public static BoundedCollection unmodifiableBoundedCollection(Collection coll) { + public static BoundedCollection unmodifiableBoundedCollection(Collection coll) { if (coll == null) { throw new IllegalArgumentException("The collection must not be null"); } diff --git a/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java b/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java index 77b1d9b8f..11c5ecaad 100644 --- a/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java +++ b/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java @@ -24,43 +24,43 @@ package org.apache.commons.collections.functors; * @version $Revision$ */ public class DefaultEquator implements Equator { - /** Static instance */ - public static final DefaultEquator INSTANCE = new DefaultEquator(); + /** Static instance */ + public static final DefaultEquator INSTANCE = new DefaultEquator(); - /** - * Hashcode used for null objects. - */ - public static final int HASHCODE_NULL = -1; + /** + * Hashcode used for null objects. + */ + public static final int HASHCODE_NULL = -1; - /** - * {@inheritDoc} Delegates to {@link Object#equals(Object)}. - */ - public boolean equate(T o1, T o2) { - return o1 == o2 || o1 != null && o1.equals(o2); - } + /** + * {@inheritDoc} Delegates to {@link Object#equals(Object)}. + */ + public boolean equate(T o1, T o2) { + return o1 == o2 || o1 != null && o1.equals(o2); + } - /** - * {@inheritDoc} - * - * @return o.hashCode() if o is non- - * null, else {@link #HASHCODE_NULL}. - */ - public int hash(T o) { - return o == null ? HASHCODE_NULL : o.hashCode(); - } + /** + * {@inheritDoc} + * + * @return o.hashCode() if o is non- + * null, else {@link #HASHCODE_NULL}. + */ + public int hash(T o) { + return o == null ? HASHCODE_NULL : o.hashCode(); + } - private Object readResolve() { - return INSTANCE; - } + private Object readResolve() { + return INSTANCE; + } - /** - * Get a typed {@link DefaultEquator} instance. - * - * @param - * @return {@link DefaultEquator#INSTANCE} - */ - @SuppressWarnings("unchecked") - public static DefaultEquator defaultEquator() { - return (DefaultEquator) DefaultEquator.INSTANCE; - } + /** + * Get a typed {@link DefaultEquator} instance. + * + * @param + * @return {@link DefaultEquator#INSTANCE} + */ + @SuppressWarnings("unchecked") + public static DefaultEquator defaultEquator() { + return (DefaultEquator) DefaultEquator.INSTANCE; + } } diff --git a/src/test/java/org/apache/commons/collections/map/TestLRUMap.java b/src/test/java/org/apache/commons/collections/map/TestLRUMap.java index 2490a6b9b..d80a084d5 100644 --- a/src/test/java/org/apache/commons/collections/map/TestLRUMap.java +++ b/src/test/java/org/apache/commons/collections/map/TestLRUMap.java @@ -510,8 +510,8 @@ public class TestLRUMap extends AbstractTestOrderedMap { } synchronized (map) { for (MapIterator iter = map.mapIterator(); iter.hasNext();) { - iter.next(); - if (iter.getValue() == this) { + iter.next(); + if (iter.getValue() == this) { iter.remove(); } } @@ -676,8 +676,8 @@ public class TestLRUMap extends AbstractTestOrderedMap { } synchronized (map) { for (Iterator iter = map.keySet().iterator(); iter.hasNext();) { - String name = (String) iter.next(); - if (name.substring(0, name.indexOf('[')).equals(getName())) { + String name = (String) iter.next(); + if (name.substring(0, name.indexOf('[')).equals(getName())) { iter.remove(); } }