Author: ggregory
Date: Mon Mar 18 21:43:09 2013
New Revision: 1458025
URL: http://svn.apache.org/r1458025
Log:
Fix code formatting from one of my previous commits.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/TreeBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/IndexedCollection.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/map/LazyMap.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMap2Test.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/AbstractMapTest.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/ReferenceMapTest.java
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java
Mon Mar 18 21:43:09 2013
@@ -584,8 +584,7 @@ public class CollectionUtils {
return false;
}
@SuppressWarnings("unchecked")
- final
- EquatorWrapper<O> otherObj = (EquatorWrapper<O>) obj;
+ final EquatorWrapper<O> otherObj = (EquatorWrapper<O>) obj;
return equator.equate(object, otherObj.getObject());
}
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java
Mon Mar 18 21:43:09 2013
@@ -522,8 +522,7 @@ public abstract class AbstractMapBag<E>
final int entrySize = in.readInt();
for (int i = 0; i < entrySize; i++) {
@SuppressWarnings("unchecked") // This will fail at runtime if the
stream is incorrect
- final
- E obj = (E) in.readObject();
+ final E obj = (E) in.readObject();
final int count = in.readInt();
map.put(obj, new MutableInteger(count));
size += count;
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/TreeBag.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/TreeBag.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/TreeBag.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bag/TreeBag.java
Mon Mar 18 21:43:09 2013
@@ -127,8 +127,7 @@ public class TreeBag<E> extends Abstract
private void readObject(final ObjectInputStream in) throws IOException,
ClassNotFoundException {
in.defaultReadObject();
@SuppressWarnings("unchecked") // This will fail at runtime if the
stream is incorrect
- final
- Comparator<? super E> comp = (Comparator<? super E>) in.readObject();
+ final Comparator<? super E> comp = (Comparator<? super E>)
in.readObject();
super.doReadObject(new TreeMap<E, MutableInteger>(comp), in);
}
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java
Mon Mar 18 21:43:09 2013
@@ -94,8 +94,7 @@ public class DualLinkedHashBidiMap<K, V>
normalMap = new LinkedHashMap<K, V>();
reverseMap = new LinkedHashMap<V, K>();
@SuppressWarnings("unchecked") // will fail at runtime if stream is
incorrect
- final
- Map<K, V> map = (Map<K, V>) in.readObject();
+ final Map<K, V> map = (Map<K, V>) in.readObject();
putAll(map);
}
}
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
Mon Mar 18 21:43:09 2013
@@ -396,8 +396,7 @@ public class DualTreeBidiMap<K, V> exten
normalMap = new TreeMap<K, V>(comparator);
reverseMap = new TreeMap<V, K>(valueComparator);
@SuppressWarnings("unchecked") // will fail at runtime if the stream
is incorrect
- final
- Map<K, V> map = (Map<K, V>) in.readObject();
+ final Map<K, V> map = (Map<K, V>) in.readObject();
putAll(map);
}
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/IndexedCollection.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/IndexedCollection.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/IndexedCollection.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/IndexedCollection.java
Mon Mar 18 21:43:09 2013
@@ -176,8 +176,7 @@ public class IndexedCollection<K, C> ext
*/
public C get(final K key) {
@SuppressWarnings("unchecked") // index is a MultiMap which returns a
Collection
- final
- Collection<C> coll = (Collection<C>) index.get(key);
+ final Collection<C> coll = (Collection<C>) index.get(key);
return coll == null ? null : coll.iterator().next();
}
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java
Mon Mar 18 21:43:09 2013
@@ -99,8 +99,7 @@ class FunctorUtils {
}
// convert to array like this to guarantee iterator() ordering
@SuppressWarnings("unchecked") // OK
- final
- Predicate<T>[] preds = new Predicate[predicates.size()];
+ final Predicate<T>[] preds = new Predicate[predicates.size()];
int i = 0;
for (final Predicate<T> predicate : predicates) {
preds[i] = predicate;
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
Mon Mar 18 21:43:09 2013
@@ -96,8 +96,7 @@ public class ListIteratorWrapper<E> impl
public void add(final E obj) throws UnsupportedOperationException {
if (iterator instanceof ListIterator) {
@SuppressWarnings("unchecked")
- final
- ListIterator<E> li = (ListIterator<E>) iterator;
+ final ListIterator<E> li = (ListIterator<E>) iterator;
li.add(obj);
return;
}
@@ -175,8 +174,7 @@ public class ListIteratorWrapper<E> impl
public E previous() throws NoSuchElementException {
if (iterator instanceof ListIterator) {
@SuppressWarnings("unchecked")
- final
- ListIterator<E> li = (ListIterator<E>) iterator;
+ final ListIterator<E> li = (ListIterator<E>) iterator;
return li.previous();
}
@@ -235,8 +233,7 @@ public class ListIteratorWrapper<E> impl
public void set(final E obj) throws UnsupportedOperationException {
if (iterator instanceof ListIterator) {
@SuppressWarnings("unchecked")
- final
- ListIterator<E> li = (ListIterator<E>) iterator;
+ final ListIterator<E> li = (ListIterator<E>) iterator;
li.set(obj);
return;
}
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/map/LazyMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/map/LazyMap.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/map/LazyMap.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/map/LazyMap.java
Mon Mar 18 21:43:09 2013
@@ -159,8 +159,7 @@ public class LazyMap<K, V> extends Abstr
// create value for key if key is not currently in the map
if (map.containsKey(key) == false) {
@SuppressWarnings("unchecked")
- final
- K castKey = (K) key;
+ final K castKey = (K) key;
final V value = factory.transform(castKey);
map.put(castKey, value);
return value;
Modified:
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMap2Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMap2Test.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMap2Test.java
(original)
+++
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMap2Test.java
Mon Mar 18 21:43:09 2013
@@ -114,8 +114,7 @@ public class DualTreeBidiMap2Test<K exte
final ObjectInputStream in = new ObjectInputStream(new
ByteArrayInputStream(buffer.toByteArray()));
@SuppressWarnings("unchecked")
- final
- DualTreeBidiMap<String, Integer> deserialised =
(DualTreeBidiMap<String, Integer>) in.readObject();
+ final DualTreeBidiMap<String, Integer> deserialised =
(DualTreeBidiMap<String, Integer>) in.readObject();
in.close();
assertNotNull(original.comparator());
Modified:
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java
(original)
+++
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java
Mon Mar 18 21:43:09 2013
@@ -111,8 +111,7 @@ public class NodeListIteratorTest extend
public void testNullConstructor(){
try{
@SuppressWarnings("unused")
- final
- NodeListIterator iter = new NodeListIterator((Node) null);
+ final NodeListIterator iter = new NodeListIterator((Node) null);
fail("IllegalArgumentException expected!");
}catch(final IllegalArgumentException e){
// expected.
Modified:
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/AbstractMapTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/AbstractMapTest.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/AbstractMapTest.java
(original)
+++
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/AbstractMapTest.java
Mon Mar 18 21:43:09 2013
@@ -759,8 +759,7 @@ public abstract class AbstractMapTest<K,
final Map<K, V> map = makeObject();
if (map instanceof Serializable && !skipSerializedCanonicalTests() &&
isTestSerialization()) {
@SuppressWarnings("unchecked")
- final
- Map<K, V> map2 = (Map<K, V>)
readExternalFormFromDisk(getCanonicalEmptyCollectionName(map));
+ final Map<K, V> map2 = (Map<K, V>)
readExternalFormFromDisk(getCanonicalEmptyCollectionName(map));
assertEquals("Map is empty", 0, map2.size());
}
}
@@ -782,8 +781,7 @@ public abstract class AbstractMapTest<K,
final Map<K, V> map = makeFullMap();
if (map instanceof Serializable && !skipSerializedCanonicalTests() &&
isTestSerialization()) {
@SuppressWarnings("unchecked")
- final
- Map<K, V> map2 = (Map<K, V>)
readExternalFormFromDisk(getCanonicalFullCollectionName(map));
+ final Map<K, V> map2 = (Map<K, V>)
readExternalFormFromDisk(getCanonicalFullCollectionName(map));
assertEquals("Map is the right size", getSampleKeys().length,
map2.size());
}
}
Modified:
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java
(original)
+++
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java
Mon Mar 18 21:43:09 2013
@@ -303,8 +303,7 @@ public class ReferenceIdentityMapTest<K,
} else {
// create garbage:
@SuppressWarnings("unused")
- final
- byte[] b = new byte[bytz];
+ final byte[] b = new byte[bytz];
bytz = bytz * 2;
}
}
Modified:
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/ReferenceMapTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/ReferenceMapTest.java?rev=1458025&r1=1458024&r2=1458025&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/ReferenceMapTest.java
(original)
+++
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/map/ReferenceMapTest.java
Mon Mar 18 21:43:09 2013
@@ -234,8 +234,7 @@ public class ReferenceMapTest<K, V> exte
} else {
// create garbage:
@SuppressWarnings("unused")
- final
- byte[] b = new byte[bytz];
+ final byte[] b = new byte[bytz];
bytz = bytz * 2;
}
}
