Author: simonetripodi
Date: Thu May 31 15:55:31 2012
New Revision: 1344786
URL: http://svn.apache.org/viewvc?rev=1344786&view=rev
Log:
[FUNCTOR-16] Fix checkstyle errors - patch submitted by Bruno P. Kinoshita
Modified:
commons/proper/functor/trunk/src/changes/changes.xml
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterable.java
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java
Modified: commons/proper/functor/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/changes/changes.xml?rev=1344786&r1=1344785&r2=1344786&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/changes/changes.xml (original)
+++ commons/proper/functor/trunk/src/changes/changes.xml Thu May 31 15:55:31
2012
@@ -23,6 +23,9 @@
</properties>
<body>
<release version="1.0" date="2012-??-??" description="First release.">
+ <action dev="simonetripodi" issue="FUNCTOR-16" due-to="Bruno P.
Kinoshita">
+ Fix checkstyle errors
+ </action>
<action dev="simonetripodi" issue="FUNCTOR-8" due-to="Bruno P.
Kinoshita">
Possible NPE in TransformedGenerator if getWrappedGenerator() is
overridden to return null
</action>
Modified:
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java
URL:
http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java?rev=1344786&r1=1344785&r2=1344786&view=diff
==============================================================================
---
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java
(original)
+++
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java
Thu May 31 15:55:31 2012
@@ -120,7 +120,8 @@ public final class BinaryProcedureBinary
* {@link BinaryFunction BinaryFunction}, or <code>null</code>
* if the given <code>BinaryFunction</code> is <code>null</code>
*/
- public static <L, R, T> BinaryProcedureBinaryFunction<L, R, T>
adapt(BinaryProcedure<? super L, ? super R> procedure) {
+ public static <L, R, T> BinaryProcedureBinaryFunction<L, R, T> adapt(
+ BinaryProcedure<? super L, ? super R> procedure) {
return null == procedure ? null : new BinaryProcedureBinaryFunction<L,
R, T>(procedure);
}
Modified:
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterable.java
URL:
http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterable.java?rev=1344786&r1=1344785&r2=1344786&view=diff
==============================================================================
---
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterable.java
(original)
+++
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterable.java
Thu May 31 15:55:31 2012
@@ -76,7 +76,7 @@ public class FilteredIterable<T> impleme
* Create a new FilteredIterable.
* @param iterable wrapped
*/
- private FilteredIterable(Iterable<? extends T> iterable) {
+ protected FilteredIterable(Iterable<? extends T> iterable) {
super();
this.iterable = iterable;
}
@@ -85,11 +85,11 @@ public class FilteredIterable<T> impleme
* {@inheritDoc}
*/
public Iterator<T> iterator() {
- UnaryPredicate<T> _predicate;
+ UnaryPredicate<T> predicateReference;
synchronized (this) {
- _predicate = predicate;
+ predicateReference = predicate;
}
- return FilteredIterator.filter(iterable.iterator(), _predicate);
+ return FilteredIterator.filter(iterable.iterator(),
predicateReference);
}
/**
Modified:
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java
URL:
http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java?rev=1344786&r1=1344785&r2=1344786&view=diff
==============================================================================
---
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java
(original)
+++
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java
Thu May 31 15:55:31 2012
@@ -41,7 +41,7 @@ public class WhileGenerate<E> extends Ba
*/
public WhileGenerate(UnaryPredicate<? super E> test, Generator<? extends
E> wrapped) {
super(Validate.notNull(wrapped, "Generator argument was null"));
- this.test = Validate.notNull(test,"UnaryPredicate argument was null");
+ this.test = Validate.notNull(test, "UnaryPredicate argument was null");
}
/**
