You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2012/03/10 18:01:13 UTC
svn commit: r1299233 - in /commons/proper/collections/trunk/src:
main/java/org/apache/commons/collections/
main/java/org/apache/commons/collections/bag/
main/java/org/apache/commons/collections/collection/
main/java/org/apache/commons/collections/funct...
Author: sebb
Date: Sat Mar 10 17:01:13 2012
New Revision: 1299233
URL: http://svn.apache.org/viewvc?rev=1299233&view=rev
Log:
Tab police
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/TransformerUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/TransformedBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestLRUMap.java
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/TransformerUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/TransformerUtils.java?rev=1299233&r1=1299232&r2=1299233&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/TransformerUtils.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/TransformerUtils.java Sat Mar 10 17:01:13 2012
@@ -192,7 +192,7 @@ public class TransformerUtils {
* @throws IllegalArgumentException if either transformer is null
*/
@SuppressWarnings("unchecked")
- public static <T> Transformer<T, T> chainedTransformer(
+ public static <T> Transformer<T, T> chainedTransformer(
Transformer<? super T, ? extends T> transformer1,
Transformer<? super T, ? extends T> transformer2) {
return ChainedTransformer.<T> chainedTransformer(transformer1, transformer2);
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/TransformedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/TransformedBag.java?rev=1299233&r1=1299232&r2=1299233&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/TransformedBag.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/TransformedBag.java Sat Mar 10 17:01:13 2012
@@ -80,7 +80,7 @@ public class TransformedBag<E>
@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]));
}
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java?rev=1299233&r1=1299232&r2=1299233&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java Sat Mar 10 17:01:13 2012
@@ -102,8 +102,8 @@ public final class UnmodifiableBag<E>
//-----------------------------------------------------------------------
@Override
public Iterator<E> iterator() {
- return UnmodifiableIterator.<E> unmodifiableIterator(decorated()
- .iterator());
+ return UnmodifiableIterator.<E> unmodifiableIterator(decorated()
+ .iterator());
}
@Override
@@ -150,7 +150,7 @@ public final class UnmodifiableBag<E>
@Override
public Set<E> uniqueSet() {
Set<E> set = decorated().uniqueSet();
- return UnmodifiableSet.<E> unmodifiableSet(set);
+ return UnmodifiableSet.<E> unmodifiableSet(set);
}
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java?rev=1299233&r1=1299232&r2=1299233&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java Sat Mar 10 17:01:13 2012
@@ -69,7 +69,7 @@ public final class UnmodifiableBoundedCo
* @throws IllegalArgumentException if bag is null
*/
@SuppressWarnings("unchecked")
- public static <E> BoundedCollection<E> unmodifiableBoundedCollection(Collection<? extends E> coll) {
+ public static <E> BoundedCollection<E> unmodifiableBoundedCollection(Collection<? extends E> coll) {
if (coll == null) {
throw new IllegalArgumentException("The collection must not be null");
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java?rev=1299233&r1=1299232&r2=1299233&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java Sat Mar 10 17:01:13 2012
@@ -24,43 +24,43 @@ package org.apache.commons.collections.f
* @version $Revision$
*/
public class DefaultEquator<T> implements Equator<T> {
- /** Static instance */
- public static final DefaultEquator<Object> INSTANCE = new DefaultEquator<Object>();
+ /** Static instance */
+ public static final DefaultEquator<Object> INSTANCE = new DefaultEquator<Object>();
- /**
- * Hashcode used for <code>null</code> objects.
- */
- public static final int HASHCODE_NULL = -1;
+ /**
+ * Hashcode used for <code>null</code> 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 <code>o.hashCode()</code> if <code>o</code> is non-
- * <code>null</code>, else {@link #HASHCODE_NULL}.
- */
- public int hash(T o) {
- return o == null ? HASHCODE_NULL : o.hashCode();
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @return <code>o.hashCode()</code> if <code>o</code> is non-
+ * <code>null</code>, 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 <T>
- * @return {@link DefaultEquator#INSTANCE}
- */
- @SuppressWarnings("unchecked")
- public static <T> DefaultEquator<T> defaultEquator() {
- return (DefaultEquator<T>) DefaultEquator.INSTANCE;
- }
+ /**
+ * Get a typed {@link DefaultEquator} instance.
+ *
+ * @param <T>
+ * @return {@link DefaultEquator#INSTANCE}
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> DefaultEquator<T> defaultEquator() {
+ return (DefaultEquator<T>) DefaultEquator.INSTANCE;
+ }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestLRUMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestLRUMap.java?rev=1299233&r1=1299232&r2=1299233&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestLRUMap.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/TestLRUMap.java Sat Mar 10 17:01:13 2012
@@ -510,8 +510,8 @@ public class TestLRUMap<K, V> extends Ab
}
synchronized (map) {
for (MapIterator<Object, Thread> 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<K, V> extends Ab
}
synchronized (map) {
for (Iterator<Object> 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();
}
}