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 2010/10/18 18:45:29 UTC
svn commit: r1023897 - in /commons/proper/collections/trunk/src:
java/org/apache/commons/collections/ListUtils.java
java/org/apache/commons/collections/functors/ComparatorPredicate.java
test/org/apache/commons/collections/TestListUtils.java
Author: sebb
Date: Mon Oct 18 16:45:29 2010
New Revision: 1023897
URL: http://svn.apache.org/viewvc?rev=1023897&view=rev
Log:
Tab and trailing space removal
Modified:
commons/proper/collections/trunk/src/java/org/apache/commons/collections/ListUtils.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ComparatorPredicate.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestListUtils.java
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/ListUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/ListUtils.java?rev=1023897&r1=1023896&r2=1023897&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/ListUtils.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/ListUtils.java Mon Oct 18 16:45:29 2010
@@ -75,8 +75,8 @@ public class ListUtils {
List<? extends E> smaller = list1;
List<? extends E> larger = list2;
if (list1.size() > list2.size()) {
- smaller = list2;
- larger = list1;
+ smaller = list2;
+ larger = list1;
}
HashSet<E> hashSet = new HashSet<E>(smaller);
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ComparatorPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ComparatorPredicate.java?rev=1023897&r1=1023896&r2=1023897&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ComparatorPredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ComparatorPredicate.java Mon Oct 18 16:45:29 2010
@@ -24,54 +24,54 @@ import org.apache.commons.collections.Pr
/**
* Predicate that compares the input object with the one stored in the predicate using a comparator.
* In addition, the comparator result can be evaluated in accordance to a supplied criterion value.
- *
+ *
* In order to demonstrate the use of the predicate, the following variables are declared:
*
* <pre>
* Integer ONE = new Integer(1);
* Integer TWO = new Integer(2);
- *
+ *
* Comparator comparator = new Comparator() {
*
* public int compare(Object first, Object second) {
- * return ((Integer) second) - ((Integer) first);
- * }
+ * return ((Integer) second) - ((Integer) first);
+ * }
*
* };
* </pre>
- *
+ *
* Using the declared variables, the <code>ComparatorPredicate</code> can be used used in the
- * following way:
- *
+ * following way:
+ *
* <pre>
- * ComparatorPredicate.getInstance(ONE, comparator).evaluate(TWO);
- * </pre>
- *
+ * ComparatorPredicate.getInstance(ONE, comparator).evaluate(TWO);
+ * </pre>
+ *
* The input variable <code>TWO</code> in compared to the stored variable <code>ONE</code> using
* the supplied <code>comparator</code>. This is the default usage of the predicate and will return
- * <code>true</code> if the underlying comparator returns <code>0</code>. In addition to the default
- * usage of the predicate, it is possible to evaluate the comparator's result in several ways. The
+ * <code>true</code> if the underlying comparator returns <code>0</code>. In addition to the default
+ * usage of the predicate, it is possible to evaluate the comparator's result in several ways. The
* following {@link Criterion} enumeration values are provided by the predicate:
* </p>
- *
+ *
* <ul>
* <li>EQUAL</li>
* <li>GREATER</li>
* <li>GREATER_OR_EQUAL</li>
* <li>LESS</li>
* <li>LESS_OR_EQUAL</li>
- * </ul>
- *
+ * </ul>
+ *
* The following examples demonstrates how these constants can be used in order to manipulate the
* evaluation of a comparator result.
- *
+ *
* <pre>
* ComparatorPredicate.getInstance(ONE, comparator, <b>ComparatorPredicate.Criterion.GREATER</b>).evaluate(TWO);
* </pre>
- *
+ *
* The input variable TWO is compared to the stored variable ONE using the supplied <code>comparator</code>
* using the <code>GREATER</code> evaluation criterion constant. This instructs the predicate to
- * return <code>true</code> if the comparator returns a value greater than <code>0</code>.
+ * return <code>true</code> if the comparator returns a value greater than <code>0</code>.
*
* @since Commons Collections 4.0
* @version $Revision: $ $Date: $
@@ -83,106 +83,106 @@ public class ComparatorPredicate<T> impl
private static final long serialVersionUID = -1863209236504077399L;
public enum Criterion {
- EQUAL, GREATER, LESS, GREATER_OR_EQUAL, LESS_OR_EQUAL,
+ EQUAL, GREATER, LESS, GREATER_OR_EQUAL, LESS_OR_EQUAL,
}
- // Instance variables:
-
- /** The internal object to compare with */
- private final T object;
-
- /** The comparator to use for comparison */
- private final Comparator<T> comparator;
-
- /** The comparison evaluation criterion to use */
- private final Criterion criterion;
-
- /**
- * Factory to create the comparator predicate
- *
- * @param object the object to compare to
- * @param comparator the comparator to use for comparison
- * @return the predicate
- * @throws IllegalArgumentException if comparator is null
- */
- public static <T> Predicate<T> getInstance(T object, Comparator<T> comparator) {
- return getInstance(object, comparator, Criterion.EQUAL);
- }
-
- /**
- * Factory to create the comparator predicate
- *
- * @param object the object to compare to
- * @param comparator the comparator to use for comparison
- * @param criterion the criterion to use to evaluate comparison
- * @return the predicate
- * @throws IllegalArgumentException if comparator is null of criterion is invalid
- */
- public static <T> Predicate<T> getInstance(T object, Comparator<T> comparator, Criterion criterion) {
+ // Instance variables:
+
+ /** The internal object to compare with */
+ private final T object;
+
+ /** The comparator to use for comparison */
+ private final Comparator<T> comparator;
+
+ /** The comparison evaluation criterion to use */
+ private final Criterion criterion;
+
+ /**
+ * Factory to create the comparator predicate
+ *
+ * @param object the object to compare to
+ * @param comparator the comparator to use for comparison
+ * @return the predicate
+ * @throws IllegalArgumentException if comparator is null
+ */
+ public static <T> Predicate<T> getInstance(T object, Comparator<T> comparator) {
+ return getInstance(object, comparator, Criterion.EQUAL);
+ }
+
+ /**
+ * Factory to create the comparator predicate
+ *
+ * @param object the object to compare to
+ * @param comparator the comparator to use for comparison
+ * @param criterion the criterion to use to evaluate comparison
+ * @return the predicate
+ * @throws IllegalArgumentException if comparator is null of criterion is invalid
+ */
+ public static <T> Predicate<T> getInstance(T object, Comparator<T> comparator, Criterion criterion) {
if (comparator == null) {
throw new IllegalArgumentException("Comparator must not be null.");
}
if (criterion == null) {
throw new IllegalArgumentException("Criterion must not be null.");
}
- return new ComparatorPredicate<T>(object, comparator, criterion);
- }
+ return new ComparatorPredicate<T>(object, comparator, criterion);
+ }
+
+ /**
+ * Constructor that performs no validation.
+ * Use <code>getInstance</code> if you want.
+ *
+ * @param object the object to compare to
+ * @param comparator the comparator to use for comparison
+ * @param criterion the criterion to use to evaluate comparison
+ */
+ public ComparatorPredicate(T object, Comparator<T> comparator, Criterion criterion) {
+ super();
+ this.object = object;
+ this.comparator = comparator;
+ this.criterion = criterion;
+ }
- /**
- * Constructor that performs no validation.
- * Use <code>getInstance</code> if you want.
- *
- * @param object the object to compare to
- * @param comparator the comparator to use for comparison
- * @param criterion the criterion to use to evaluate comparison
- */
- public ComparatorPredicate(T object, Comparator<T> comparator, Criterion criterion) {
- super();
- this.object = object;
- this.comparator = comparator;
- this.criterion = criterion;
- }
-
- /**
- * Evaluates the predicate. The predicate evaluates to <code>true</code> in the following cases:
- *
- * <ul>
- * <li><code>comparator.compare(object, input) == 0 && criterion == EQUAL</code></li>
- * <li><code>comparator.compare(object, input) < 0 && criterion == LESS</code></li>
- * <li><code>comparator.compare(object, input) > 0 && criterion == GREATER</code></li>
- * <li><code>comparator.compare(object, input) >= 0 && criterion == GREATER_OR_EQUAL</code></li>
- * <li><code>comparator.compare(object, input) <= 0 && criterion == LESS_OR_EQUAL</code></li>
- * </ul>
- *
- * @see org.apache.commons.collections.Predicate#evaluate(java.lang.Object)
- * @see java.util.Comparator#compare(java.lang.Object first, java.lang.Object second)
- *
- * @throws IllegalStateException if the criterion is invalid (really not possible)
- */
- public boolean evaluate(T target) {
+ /**
+ * Evaluates the predicate. The predicate evaluates to <code>true</code> in the following cases:
+ *
+ * <ul>
+ * <li><code>comparator.compare(object, input) == 0 && criterion == EQUAL</code></li>
+ * <li><code>comparator.compare(object, input) < 0 && criterion == LESS</code></li>
+ * <li><code>comparator.compare(object, input) > 0 && criterion == GREATER</code></li>
+ * <li><code>comparator.compare(object, input) >= 0 && criterion == GREATER_OR_EQUAL</code></li>
+ * <li><code>comparator.compare(object, input) <= 0 && criterion == LESS_OR_EQUAL</code></li>
+ * </ul>
+ *
+ * @see org.apache.commons.collections.Predicate#evaluate(java.lang.Object)
+ * @see java.util.Comparator#compare(java.lang.Object first, java.lang.Object second)
+ *
+ * @throws IllegalStateException if the criterion is invalid (really not possible)
+ */
+ public boolean evaluate(T target) {
- boolean result = false;
- int comparison = comparator.compare(object, target);
+ boolean result = false;
+ int comparison = comparator.compare(object, target);
switch (criterion) {
- case EQUAL:
- result = (comparison == 0);
- break;
- case GREATER:
- result = (comparison > 0);
- break;
- case LESS:
- result = (comparison < 0);
- break;
- case GREATER_OR_EQUAL:
- result = (comparison >= 0);
- break;
- case LESS_OR_EQUAL:
- result = (comparison <= 0);
- break;
- default:
- throw new IllegalStateException("The current criterion '" + criterion + "' is invalid.");
- }
+ case EQUAL:
+ result = (comparison == 0);
+ break;
+ case GREATER:
+ result = (comparison > 0);
+ break;
+ case LESS:
+ result = (comparison < 0);
+ break;
+ case GREATER_OR_EQUAL:
+ result = (comparison >= 0);
+ break;
+ case LESS_OR_EQUAL:
+ result = (comparison <= 0);
+ break;
+ default:
+ throw new IllegalStateException("The current criterion '" + criterion + "' is invalid.");
+ }
- return result;
- }
+ return result;
+ }
}
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestListUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestListUtils.java?rev=1023897&r1=1023896&r2=1023897&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestListUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestListUtils.java Mon Oct 18 16:45:29 2010
@@ -117,15 +117,15 @@ public class TestListUtils extends BulkT
* Tests intersecting two lists in different orders.
*/
public void testIntersectionOrderInsensitivity() {
- List<String> one = new ArrayList<String>();
- List<String> two = new ArrayList<String>();
- one.add("a");
- one.add("b");
- two.add("a");
- two.add("a");
- two.add("b");
- two.add("b");
- assertEquals(ListUtils.intersection(one,two),ListUtils.intersection(two, one));
+ List<String> one = new ArrayList<String>();
+ List<String> two = new ArrayList<String>();
+ one.add("a");
+ one.add("b");
+ two.add("a");
+ two.add("a");
+ two.add("b");
+ two.add("b");
+ assertEquals(ListUtils.intersection(one,two),ListUtils.intersection(two, one));
}
public void testPredicatedList() {