Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 97528 invoked from network); 3 Apr 2008 20:44:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Apr 2008 20:44:26 -0000 Received: (qmail 69566 invoked by uid 500); 3 Apr 2008 20:44:24 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 69477 invoked by uid 500); 3 Apr 2008 20:44:23 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 69468 invoked by uid 99); 3 Apr 2008 20:44:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Apr 2008 13:44:23 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Apr 2008 20:43:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EFC591A983A; Thu, 3 Apr 2008 13:43:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r644480 [1/3] - in /commons/sandbox/functor/trunk/src: main/java/org/apache/commons/functor/ main/java/org/apache/commons/functor/adapter/ main/java/org/apache/commons/functor/core/ main/java/org/apache/commons/functor/core/collection/ main... Date: Thu, 03 Apr 2008 20:43:37 -0000 To: commits@commons.apache.org From: mbenson@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080403204353.EFC591A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mbenson Date: Thu Apr 3 13:43:29 2008 New Revision: 644480 URL: http://svn.apache.org/viewvc?rev=644480&view=rev Log: checkstyle Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/Algorithms.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionUnaryFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Constant.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Identity.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsInstanceOf.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/LeftIdentity.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Limit.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Offset.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/RightIdentity.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterator.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/Size.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/TransformedIterator.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/And.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Not.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Or.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/BaseGenerator.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/CollectionTransformer.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/EachElement.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/LongRange.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/BaseFunctorTest.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/TestAlgorithms.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestSize.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAnd.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryAnd.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryOr.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinarySequence.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryFunction.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryPredicate.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryProcedure.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestOr.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestSequence.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedProcedure.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryAnd.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryOr.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnarySequence.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/FlexiMapExample.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/QuicksortExample.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/four/Abs.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/four/NthColumn.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/four/ToInteger.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/Add.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/BinaryFunctionUnaryFunction.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/Divide.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/Mod.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/Money.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/Multiply.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/Subtract.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/SupermarketPricingExample.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/ToMoney.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/two/BaseBinaryChop.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/two/EiffelStyleLoop.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/two/TestBinaryChop.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/lines/Lines.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/lines/Sum.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/lines/WordCount.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/map/FixedSizeMap.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/map/FunctoredMap.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/map/LazyMap.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/map/PredicatedMap.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/map/TestLazyMap.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/generator/TestBaseGenerator.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestEachElement.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestIntegerRange.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestLongRange.java Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/Algorithms.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/Algorithms.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/Algorithms.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/Algorithms.java Thu Apr 3 13:43:29 2008 @@ -94,7 +94,7 @@ */ public static void retain(Iterator iter, UnaryPredicate pred) { while(iter.hasNext()) { - if(!(pred.test(iter.next()))) { + if (!(pred.test(iter.next()))) { iter.remove(); } } @@ -110,7 +110,7 @@ */ public static void remove(Iterator iter, UnaryPredicate pred) { while(iter.hasNext()) { - if(pred.test(iter.next())) { + if (pred.test(iter.next())) { iter.remove(); } } @@ -187,7 +187,7 @@ public static final Object detect(final Generator gen, final UnaryPredicate pred) { FindWithinGenerator finder = new FindWithinGenerator(gen,pred); gen.run(finder); - if(finder.wasFound()) { + if (finder.wasFound()) { return finder.getFoundObject(); } else { throw new NoSuchElementException("No element matching " + pred + " was found."); @@ -354,8 +354,8 @@ // when the function doesn't return another function of the same type. while(true) { result = function.evaluate(); - if(recursiveFunctionClass.isInstance(result)) { - function = (Function)result; + if (recursiveFunctionClass.isInstance(result)) { + function = (Function) result; continue; } else { break; @@ -377,7 +377,7 @@ } public void run(Object obj) { - if(predicate.test(obj)) { + if (predicate.test(obj)) { found = true; foundObject = obj; generator.stop(); Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java Thu Apr 3 13:43:29 2008 @@ -60,8 +60,8 @@ } public boolean equals(Object that) { - if(that instanceof BinaryFunctionBinaryPredicate) { - return equals((BinaryFunctionBinaryPredicate)that); + if (that instanceof BinaryFunctionBinaryPredicate) { + return equals((BinaryFunctionBinaryPredicate) that); } else { return false; } @@ -73,7 +73,7 @@ public int hashCode() { int hash = "BinaryFunctionBinaryPredicate".hashCode(); - if(null != function) { + if (null != function) { hash ^= function.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java Thu Apr 3 13:43:29 2008 @@ -56,8 +56,8 @@ } public boolean equals(Object that) { - if(that instanceof BinaryFunctionBinaryProcedure) { - return equals((BinaryFunctionBinaryProcedure)that); + if (that instanceof BinaryFunctionBinaryProcedure) { + return equals((BinaryFunctionBinaryProcedure) that); } else { return false; } @@ -69,7 +69,7 @@ public int hashCode() { int hash = "BinaryFunctionBinaryProcedure".hashCode(); - if(null != function) { + if (null != function) { hash ^= function.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java Thu Apr 3 13:43:29 2008 @@ -54,8 +54,8 @@ } public boolean equals(Object that) { - if(that instanceof BinaryPredicateBinaryFunction) { - return equals((BinaryPredicateBinaryFunction)that); + if (that instanceof BinaryPredicateBinaryFunction) { + return equals((BinaryPredicateBinaryFunction) that); } else { return false; } @@ -67,7 +67,7 @@ public int hashCode() { int hash = "BinaryPredicateBinaryFunction".hashCode(); - if(null != predicate) { + if (null != predicate) { hash ^= predicate.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java Thu Apr 3 13:43:29 2008 @@ -49,8 +49,8 @@ } public boolean equals(Object that) { - if(that instanceof BinaryProcedureBinaryFunction) { - return equals((BinaryProcedureBinaryFunction)that); + if (that instanceof BinaryProcedureBinaryFunction) { + return equals((BinaryProcedureBinaryFunction) that); } else { return false; } @@ -62,7 +62,7 @@ public int hashCode() { int hash = "BinaryProcedureBinaryFunction".hashCode(); - if(null != procedure) { + if (null != procedure) { hash ^= procedure.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundFunction.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundFunction.java Thu Apr 3 13:43:29 2008 @@ -53,8 +53,8 @@ } public boolean equals(Object that) { - if(that instanceof BoundFunction) { - return equals((BoundFunction)that); + if (that instanceof BoundFunction) { + return equals((BoundFunction) that); } else { return false; } @@ -70,11 +70,11 @@ public int hashCode() { int hash = "BoundFunction".hashCode(); - if(null != function) { + if (null != function) { hash <<= 2; hash ^= function.hashCode(); } - if(null != param) { + if (null != param) { hash <<= 2; hash ^= param.hashCode(); } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundPredicate.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundPredicate.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundPredicate.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundPredicate.java Thu Apr 3 13:43:29 2008 @@ -53,8 +53,8 @@ } public boolean equals(Object that) { - if(that instanceof BoundPredicate) { - return equals((BoundPredicate)that); + if (that instanceof BoundPredicate) { + return equals((BoundPredicate) that); } else { return false; } @@ -70,11 +70,11 @@ public int hashCode() { int hash = "BoundPredicate".hashCode(); - if(null != predicate) { + if (null != predicate) { hash <<= 2; hash ^= predicate.hashCode(); } - if(null != param) { + if (null != param) { hash <<= 2; hash ^= param.hashCode(); } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundProcedure.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundProcedure.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundProcedure.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BoundProcedure.java Thu Apr 3 13:43:29 2008 @@ -53,8 +53,8 @@ } public boolean equals(Object that) { - if(that instanceof BoundProcedure) { - return equals((BoundProcedure)that); + if (that instanceof BoundProcedure) { + return equals((BoundProcedure) that); } else { return false; } @@ -70,11 +70,11 @@ public int hashCode() { int hash = "BoundProcedure".hashCode(); - if(null != procedure) { + if (null != procedure) { hash <<= 2; hash ^= procedure.hashCode(); } - if(null != param) { + if (null != param) { hash <<= 2; hash ^= param.hashCode(); } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java Thu Apr 3 13:43:29 2008 @@ -54,8 +54,8 @@ } public boolean equals(Object that) { - if(that instanceof FunctionPredicate) { - return equals((FunctionPredicate)that); + if (that instanceof FunctionPredicate) { + return equals((FunctionPredicate) that); } else { return false; } @@ -67,7 +67,7 @@ public int hashCode() { int hash = "FunctionPredicate".hashCode(); - if(null != function) { + if (null != function) { hash ^= function.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java Thu Apr 3 13:43:29 2008 @@ -56,8 +56,8 @@ } public boolean equals(Object that) { - if(that instanceof FunctionProcedure) { - return equals((FunctionProcedure)that); + if (that instanceof FunctionProcedure) { + return equals((FunctionProcedure) that); } else { return false; } @@ -69,7 +69,7 @@ public int hashCode() { int hash = "FunctionProcedure".hashCode(); - if(null != function) { + if (null != function) { hash ^= function.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionUnaryFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionUnaryFunction.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionUnaryFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionUnaryFunction.java Thu Apr 3 13:43:29 2008 @@ -48,8 +48,8 @@ } public boolean equals(Object that) { - if(that instanceof FunctionUnaryFunction) { - return equals((FunctionUnaryFunction)that); + if (that instanceof FunctionUnaryFunction) { + return equals((FunctionUnaryFunction) that); } else { return false; } @@ -61,7 +61,7 @@ public int hashCode() { int hash = "FunctionUnaryFunction".hashCode(); - if(null != function) { + if (null != function) { hash ^= function.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java Thu Apr 3 13:43:29 2008 @@ -48,8 +48,8 @@ } public boolean equals(Object that) { - if(that instanceof IgnoreLeftFunction) { - return equals((IgnoreLeftFunction)that); + if (that instanceof IgnoreLeftFunction) { + return equals((IgnoreLeftFunction) that); } else { return false; } @@ -61,7 +61,7 @@ public int hashCode() { int hash = "IgnoreLeftFunction".hashCode(); - if(null != function) { + if (null != function) { hash ^= function.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java Thu Apr 3 13:43:29 2008 @@ -48,8 +48,8 @@ } public boolean equals(Object that) { - if(that instanceof IgnoreLeftPredicate) { - return equals((IgnoreLeftPredicate)that); + if (that instanceof IgnoreLeftPredicate) { + return equals((IgnoreLeftPredicate) that); } else { return false; } @@ -61,7 +61,7 @@ public int hashCode() { int hash = "IgnoreLeftPredicate".hashCode(); - if(null != predicate) { + if (null != predicate) { hash ^= predicate.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java Thu Apr 3 13:43:29 2008 @@ -48,8 +48,8 @@ } public boolean equals(Object that) { - if(that instanceof IgnoreLeftProcedure) { - return equals((IgnoreLeftProcedure)that); + if (that instanceof IgnoreLeftProcedure) { + return equals((IgnoreLeftProcedure) that); } else { return false; } @@ -61,7 +61,7 @@ public int hashCode() { int hash = "IgnoreLeftProcedure".hashCode(); - if(null != procedure) { + if (null != procedure) { hash ^= procedure.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java Thu Apr 3 13:43:29 2008 @@ -48,8 +48,8 @@ } public boolean equals(Object that) { - if(that instanceof IgnoreRightFunction) { - return equals((IgnoreRightFunction)that); + if (that instanceof IgnoreRightFunction) { + return equals((IgnoreRightFunction) that); } else { return false; } @@ -61,7 +61,7 @@ public int hashCode() { int hash = "IgnoreRightFunction".hashCode(); - if(null != function) { + if (null != function) { hash ^= function.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java Thu Apr 3 13:43:29 2008 @@ -48,8 +48,8 @@ } public boolean equals(Object that) { - if(that instanceof IgnoreRightPredicate) { - return equals((IgnoreRightPredicate)that); + if (that instanceof IgnoreRightPredicate) { + return equals((IgnoreRightPredicate) that); } else { return false; } @@ -61,7 +61,7 @@ public int hashCode() { int hash = "IgnoreRightPredicate".hashCode(); - if(null != predicate) { + if (null != predicate) { hash ^= predicate.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java Thu Apr 3 13:43:29 2008 @@ -48,8 +48,8 @@ } public boolean equals(Object that) { - if(that instanceof IgnoreRightProcedure) { - return equals((IgnoreRightProcedure)that); + if (that instanceof IgnoreRightProcedure) { + return equals((IgnoreRightProcedure) that); } else { return false; } @@ -61,7 +61,7 @@ public int hashCode() { int hash = "IgnoreRightProcedure".hashCode(); - if(null != procedure) { + if (null != procedure) { hash ^= procedure.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java Thu Apr 3 13:43:29 2008 @@ -53,8 +53,8 @@ } public boolean equals(Object that) { - if(that instanceof LeftBoundFunction) { - return equals((LeftBoundFunction)that); + if (that instanceof LeftBoundFunction) { + return equals((LeftBoundFunction) that); } else { return false; } @@ -70,11 +70,11 @@ public int hashCode() { int hash = "LeftBoundFunction".hashCode(); - if(null != function) { + if (null != function) { hash <<= 2; hash ^= function.hashCode(); } - if(null != param) { + if (null != param) { hash <<= 2; hash ^= param.hashCode(); } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java Thu Apr 3 13:43:29 2008 @@ -53,8 +53,8 @@ } public boolean equals(Object that) { - if(that instanceof LeftBoundPredicate) { - return equals((LeftBoundPredicate)that); + if (that instanceof LeftBoundPredicate) { + return equals((LeftBoundPredicate) that); } else { return false; } @@ -70,11 +70,11 @@ public int hashCode() { int hash = "LeftBoundPredicate".hashCode(); - if(null != predicate) { + if (null != predicate) { hash <<= 2; hash ^= predicate.hashCode(); } - if(null != param) { + if (null != param) { hash <<= 2; hash ^= param.hashCode(); } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java Thu Apr 3 13:43:29 2008 @@ -53,8 +53,8 @@ } public boolean equals(Object that) { - if(that instanceof LeftBoundProcedure) { - return equals((LeftBoundProcedure)that); + if (that instanceof LeftBoundProcedure) { + return equals((LeftBoundProcedure) that); } else { return false; } @@ -70,11 +70,11 @@ public int hashCode() { int hash = "LeftBoundProcedure".hashCode(); - if(null != procedure) { + if (null != procedure) { hash <<= 2; hash ^= procedure.hashCode(); } - if(null != param) { + if (null != param) { hash <<= 2; hash ^= param.hashCode(); } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java Thu Apr 3 13:43:29 2008 @@ -54,8 +54,8 @@ } public boolean equals(Object that) { - if(that instanceof PredicateFunction) { - return equals((PredicateFunction)that); + if (that instanceof PredicateFunction) { + return equals((PredicateFunction) that); } else { return false; } @@ -67,7 +67,7 @@ public int hashCode() { int hash = "PredicateFunction".hashCode(); - if(null != predicate) { + if (null != predicate) { hash ^= predicate.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java Thu Apr 3 13:43:29 2008 @@ -48,8 +48,8 @@ } public boolean equals(Object that) { - if(that instanceof PredicateUnaryPredicate) { - return equals((PredicateUnaryPredicate)that); + if (that instanceof PredicateUnaryPredicate) { + return equals((PredicateUnaryPredicate) that); } else { return false; } @@ -61,7 +61,7 @@ public int hashCode() { int hash = "PredicateUnaryPredicate".hashCode(); - if(null != predicate) { + if (null != predicate) { hash ^= predicate.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java Thu Apr 3 13:43:29 2008 @@ -49,8 +49,8 @@ } public boolean equals(Object that) { - if(that instanceof ProcedureFunction) { - return equals((ProcedureFunction)that); + if (that instanceof ProcedureFunction) { + return equals((ProcedureFunction) that); } else { return false; } @@ -62,7 +62,7 @@ public int hashCode() { int hash = "ProcedureFunction".hashCode(); - if(null != procedure) { + if (null != procedure) { hash ^= procedure.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java Thu Apr 3 13:43:29 2008 @@ -48,8 +48,8 @@ } public boolean equals(Object that) { - if(that instanceof ProcedureUnaryProcedure) { - return equals((ProcedureUnaryProcedure)that); + if (that instanceof ProcedureUnaryProcedure) { + return equals((ProcedureUnaryProcedure) that); } else { return false; } @@ -61,7 +61,7 @@ public int hashCode() { int hash = "ProcedureUnaryProcedure".hashCode(); - if(null != procedure) { + if (null != procedure) { hash ^= procedure.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java Thu Apr 3 13:43:29 2008 @@ -53,8 +53,8 @@ } public boolean equals(Object that) { - if(that instanceof RightBoundFunction) { - return equals((RightBoundFunction)that); + if (that instanceof RightBoundFunction) { + return equals((RightBoundFunction) that); } else { return false; } @@ -70,11 +70,11 @@ public int hashCode() { int hash = "RightBoundFunction".hashCode(); - if(null != function) { + if (null != function) { hash <<= 2; hash ^= function.hashCode(); } - if(null != param) { + if (null != param) { hash <<= 2; hash ^= param.hashCode(); } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java Thu Apr 3 13:43:29 2008 @@ -53,8 +53,8 @@ } public boolean equals(Object that) { - if(that instanceof RightBoundPredicate) { - return equals((RightBoundPredicate)that); + if (that instanceof RightBoundPredicate) { + return equals((RightBoundPredicate) that); } else { return false; } @@ -70,11 +70,11 @@ public int hashCode() { int hash = "RightBoundPredicate".hashCode(); - if(null != predicate) { + if (null != predicate) { hash <<= 2; hash ^= predicate.hashCode(); } - if(null != param) { + if (null != param) { hash <<= 2; hash ^= param.hashCode(); } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java Thu Apr 3 13:43:29 2008 @@ -53,8 +53,8 @@ } public boolean equals(Object that) { - if(that instanceof RightBoundProcedure) { - return equals((RightBoundProcedure)that); + if (that instanceof RightBoundProcedure) { + return equals((RightBoundProcedure) that); } else { return false; } @@ -70,11 +70,11 @@ public int hashCode() { int hash = "RightBoundProcedure".hashCode(); - if(null != procedure) { + if (null != procedure) { hash <<= 2; hash ^= procedure.hashCode(); } - if(null != param) { + if (null != param) { hash <<= 2; hash ^= param.hashCode(); } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java Thu Apr 3 13:43:29 2008 @@ -60,8 +60,8 @@ } public boolean equals(Object that) { - if(that instanceof UnaryFunctionUnaryPredicate) { - return equals((UnaryFunctionUnaryPredicate)that); + if (that instanceof UnaryFunctionUnaryPredicate) { + return equals((UnaryFunctionUnaryPredicate) that); } else { return false; } @@ -73,7 +73,7 @@ public int hashCode() { int hash = "UnaryFunctionUnaryPredicate".hashCode(); - if(null != function) { + if (null != function) { hash ^= function.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java Thu Apr 3 13:43:29 2008 @@ -56,8 +56,8 @@ } public boolean equals(Object that) { - if(that instanceof UnaryFunctionUnaryProcedure) { - return equals((UnaryFunctionUnaryProcedure)that); + if (that instanceof UnaryFunctionUnaryProcedure) { + return equals((UnaryFunctionUnaryProcedure) that); } else { return false; } @@ -69,7 +69,7 @@ public int hashCode() { int hash = "UnaryFunctionUnaryProcedure".hashCode(); - if(null != function) { + if (null != function) { hash ^= function.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java Thu Apr 3 13:43:29 2008 @@ -54,8 +54,8 @@ } public boolean equals(Object that) { - if(that instanceof UnaryPredicateUnaryFunction) { - return equals((UnaryPredicateUnaryFunction)that); + if (that instanceof UnaryPredicateUnaryFunction) { + return equals((UnaryPredicateUnaryFunction) that); } else { return false; } @@ -67,7 +67,7 @@ public int hashCode() { int hash = "UnaryPredicateUnaryFunction".hashCode(); - if(null != predicate) { + if (null != predicate) { hash ^= predicate.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java Thu Apr 3 13:43:29 2008 @@ -49,8 +49,8 @@ } public boolean equals(Object that) { - if(that instanceof UnaryProcedureUnaryFunction) { - return equals((UnaryProcedureUnaryFunction)that); + if (that instanceof UnaryProcedureUnaryFunction) { + return equals((UnaryProcedureUnaryFunction) that); } else { return false; } @@ -62,7 +62,7 @@ public int hashCode() { int hash = "UnaryProcedureUnaryFunction".hashCode(); - if(null != procedure) { + if (null != procedure) { hash ^= procedure.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Constant.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Constant.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Constant.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Constant.java Thu Apr 3 13:43:29 2008 @@ -68,7 +68,7 @@ } public boolean test() { - return ((Boolean)evaluate()).booleanValue(); + return ((Boolean) evaluate()).booleanValue(); } public boolean test(Object obj) { @@ -80,8 +80,8 @@ } public boolean equals(Object that) { - if(that instanceof Constant) { - return equals((Constant)that); + if (that instanceof Constant) { + return equals((Constant) that); } else { return false; } @@ -93,7 +93,7 @@ public int hashCode() { int hash = "Constant".hashCode(); - if(null != value) { + if (null != value) { hash ^= value.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Identity.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Identity.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Identity.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Identity.java Thu Apr 3 13:43:29 2008 @@ -47,7 +47,7 @@ } public boolean test(Object obj) { - return test((Boolean)obj); + return test((Boolean) obj); } public boolean test(Boolean bool) { Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsInstanceOf.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsInstanceOf.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsInstanceOf.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsInstanceOf.java Thu Apr 3 13:43:29 2008 @@ -45,8 +45,8 @@ } public boolean equals(Object that) { - if(that instanceof IsInstanceOf) { - return equals((IsInstanceOf)that); + if (that instanceof IsInstanceOf) { + return equals((IsInstanceOf) that); } else { return false; } @@ -58,7 +58,7 @@ public int hashCode() { int hash = "IsInstanceOf".hashCode(); - if(null != klass) { + if (null != klass) { hash ^= klass.hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/LeftIdentity.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/LeftIdentity.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/LeftIdentity.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/LeftIdentity.java Thu Apr 3 13:43:29 2008 @@ -48,7 +48,7 @@ } public boolean test(Object left, Object right) { - return test((Boolean)left); + return test((Boolean) left); } private boolean test(Boolean bool) { Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Limit.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Limit.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Limit.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Limit.java Thu Apr 3 13:43:29 2008 @@ -33,7 +33,7 @@ public final class Limit implements Predicate, UnaryPredicate, BinaryPredicate { public Limit(int count) { - if(count < 0) { + if (count < 0) { throw new IllegalArgumentException("Argument must be a non-negative integer."); } this.max = count; @@ -41,7 +41,7 @@ public boolean test() { // stop incremeting when we've hit max, so we don't loop around - if(current < max) { + if (current < max) { current++; return true; } else { Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Offset.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Offset.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Offset.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Offset.java Thu Apr 3 13:43:29 2008 @@ -34,7 +34,7 @@ public final class Offset implements Predicate, UnaryPredicate, BinaryPredicate { public Offset(int count) { - if(count < 0) { + if (count < 0) { throw new IllegalArgumentException("Argument must be a non-negative integer."); } this.min = count; @@ -42,7 +42,7 @@ public boolean test() { // stop incremeting when we've hit max, so we don't loop around - if(current < min) { + if (current < min) { current++; return false; } else { Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/RightIdentity.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/RightIdentity.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/RightIdentity.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/RightIdentity.java Thu Apr 3 13:43:29 2008 @@ -48,7 +48,7 @@ } public boolean test(Object left, Object right) { - return test((Boolean)right); + return test((Boolean) right); } private boolean test(Boolean bool) { Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterator.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterator.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterator.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterator.java Thu Apr 3 13:43:29 2008 @@ -31,7 +31,7 @@ // ------------------------------------------------------------------------ public FilteredIterator(Iterator iterator, UnaryPredicate predicate) { - if(null == iterator || null == predicate) { + if (null == iterator || null == predicate) { throw new NullPointerException(); } else { this.predicate = predicate; @@ -46,7 +46,7 @@ * @see java.util.Iterator#hasNext() */ public boolean hasNext() { - if(nextSet) { + if (nextSet) { return true; } else { return setNext(); @@ -57,7 +57,7 @@ * @see java.util.Iterator#next() */ public Object next() { - if(hasNext()) { + if (hasNext()) { return returnNext(); } else { throw new NoSuchElementException(); @@ -68,7 +68,7 @@ * @see java.util.Iterator#remove() */ public void remove() { - if(canRemove) { + if (canRemove) { canRemove = false; iterator.remove(); } else { @@ -78,8 +78,8 @@ public boolean equals(Object obj) { - if(obj instanceof FilteredIterator) { - FilteredIterator that = (FilteredIterator)obj; + if (obj instanceof FilteredIterator) { + FilteredIterator that = (FilteredIterator) obj; return predicate.equals(that.predicate) && iterator.equals(that.iterator); } else { return false; @@ -113,7 +113,7 @@ while(iterator.hasNext()) { canRemove = false; Object obj = iterator.next(); - if(predicate.test(obj)) { + if (predicate.test(obj)) { next = obj; nextSet = true; return true; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java Thu Apr 3 13:43:29 2008 @@ -45,11 +45,11 @@ //--------------------------------------------------------------- public boolean test(Object obj, Object col) { - if(col instanceof Collection) { - return testCollection(obj,(Collection)col); - } else if(null != col && col.getClass().isArray()) { + if (col instanceof Collection) { + return testCollection(obj,(Collection) col); + } else if (null != col && col.getClass().isArray()) { return testArray(obj,col); - } else if(null == col) { + } else if (null == col) { throw new NullPointerException("Right side argument must not be null."); } else { throw new IllegalArgumentException("Expected Collection or Array, found " + col.getClass()); @@ -73,13 +73,13 @@ } private boolean testArray(Object obj, Object array) { - for(int i=0,m=Array.getLength(array);i= 0 && c.compareTo(max) <= 0; } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java Thu Apr 3 13:43:29 2008 @@ -48,8 +48,8 @@ * @see java.lang.Object#equals(Object) */ public boolean equals(Object that) { - if(that instanceof Max) { - return equals((Max)that); + if (that instanceof Max) { + return equals((Max) that); } else { return false; } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java Thu Apr 3 13:43:29 2008 @@ -48,8 +48,8 @@ * @see java.lang.Object#equals(Object) */ public boolean equals(Object that) { - if(that instanceof Min) { - return equals((Min)that); + if (that instanceof Min) { + return equals((Min) that); } else { return false; } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java Thu Apr 3 13:43:29 2008 @@ -38,7 +38,7 @@ public boolean equals(Object object) { if (object instanceof AbstractLoopProcedure) { - AbstractLoopProcedure that = (AbstractLoopProcedure)object; + AbstractLoopProcedure that = (AbstractLoopProcedure) object; return (null == getCondition() ? null == that.getCondition() : getCondition().equals(that.getCondition())) && (null == getAction() ? null == that.getAction() : getAction().equals(that.getAction())); } else { @@ -55,11 +55,11 @@ } protected int hashCode(int hash) { hash <<= 4; - if(null != getAction()) { + if (null != getAction()) { hash ^= getAction().hashCode(); } hash <<= 4; - if(null != getCondition()) { + if (null != getCondition()) { hash ^= getCondition().hashCode(); } return hash; Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/And.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/And.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/And.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/And.java Thu Apr 3 13:43:29 2008 @@ -66,8 +66,8 @@ // predicate interface // ------------------------------------------------------------------------ public boolean test() { - for(Iterator iter = getPredicateIterator(); iter.hasNext();) { - if(!((Predicate)iter.next()).test()) { + for (Iterator iter = getPredicateIterator(); iter.hasNext();) { + if (!((Predicate) iter.next()).test()) { return false; } } @@ -75,8 +75,8 @@ } public boolean equals(Object that) { - if(that instanceof And) { - return equals((And)that); + if (that instanceof And) { + return equals((And) that); } else { return false; } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java Thu Apr 3 13:43:29 2008 @@ -66,8 +66,8 @@ // predicate interface // ------------------------------------------------------------------------ public boolean test(Object a, Object b) { - for(Iterator iter = getBinaryPredicateIterator(); iter.hasNext();) { - if(!((BinaryPredicate)iter.next()).test(a,b)) { + for (Iterator iter = getBinaryPredicateIterator(); iter.hasNext();) { + if (!((BinaryPredicate) iter.next()).test(a, b)) { return false; } } @@ -75,8 +75,8 @@ } public boolean equals(Object that) { - if(that instanceof BinaryAnd) { - return equals((BinaryAnd)that); + if (that instanceof BinaryAnd) { + return equals((BinaryAnd) that); } else { return false; } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java Thu Apr 3 13:43:29 2008 @@ -53,8 +53,8 @@ } public boolean equals(Object that) { - if(that instanceof BinaryCompositeBinaryFunction) { - return equals((BinaryCompositeBinaryFunction)that); + if (that instanceof BinaryCompositeBinaryFunction) { + return equals((BinaryCompositeBinaryFunction) that); } else { return false; } @@ -69,15 +69,15 @@ public int hashCode() { int hash = "BinaryCompositeBinaryFunction".hashCode(); - if(null != binary) { + if (null != binary) { hash <<= 4; hash ^= binary.hashCode(); } - if(null != leftBinary) { + if (null != leftBinary) { hash <<= 4; hash ^= leftBinary.hashCode(); } - if(null != rightBinary) { + if (null != rightBinary) { hash <<= 4; hash ^= rightBinary.hashCode(); } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java?rev=644480&r1=644479&r2=644480&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java Thu Apr 3 13:43:29 2008 @@ -50,8 +50,8 @@ } public boolean equals(Object that) { - if(that instanceof BinaryNot) { - return equals((BinaryNot)that); + if (that instanceof BinaryNot) { + return equals((BinaryNot) that); } else { return false; } @@ -63,7 +63,7 @@ public int hashCode() { int hash = "BinaryNot".hashCode(); - if(null != predicate) { + if (null != predicate) { hash ^= predicate.hashCode(); } return hash;