You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by Simone Tripodi <si...@apache.org> on 2011/06/18 00:05:41 UTC
Re: svn commit: r1137042 - in /commons/sandbox/meiyo/trunk/src/main/java/org/apache/commons/meiyo/classpath:
ClassPathScanner.java HandlerConfigurationsBuilder.java
GREAT, thanks!!! :)
nice to see you in action, Matt!!!
All the best, have a nice day!!!
Simo
http://people.apache.org/~simonetripodi/
http://www.99soft.org/
On Fri, Jun 17, 2011 at 11:39 PM, <mb...@apache.org> wrote:
> Author: mbenson
> Date: Fri Jun 17 21:39:46 2011
> New Revision: 1137042
>
> URL: http://svn.apache.org/viewvc?rev=1137042&view=rev
> Log:
> can use Iterable instead of Collection
>
> Modified:
> commons/sandbox/meiyo/trunk/src/main/java/org/apache/commons/meiyo/classpath/ClassPathScanner.java
> commons/sandbox/meiyo/trunk/src/main/java/org/apache/commons/meiyo/classpath/HandlerConfigurationsBuilder.java
>
> Modified: commons/sandbox/meiyo/trunk/src/main/java/org/apache/commons/meiyo/classpath/ClassPathScanner.java
> URL: http://svn.apache.org/viewvc/commons/sandbox/meiyo/trunk/src/main/java/org/apache/commons/meiyo/classpath/ClassPathScanner.java?rev=1137042&r1=1137041&r2=1137042&view=diff
> ==============================================================================
> --- commons/sandbox/meiyo/trunk/src/main/java/org/apache/commons/meiyo/classpath/ClassPathScanner.java (original)
> +++ commons/sandbox/meiyo/trunk/src/main/java/org/apache/commons/meiyo/classpath/ClassPathScanner.java Fri Jun 17 21:39:46 2011
> @@ -24,6 +24,7 @@ import java.io.IOException;
> import java.util.Arrays;
> import java.util.Collection;
> import java.util.Enumeration;
> +import java.util.Iterator;
> import java.util.jar.JarEntry;
> import java.util.jar.JarFile;
> import java.util.regex.Pattern;
> @@ -103,17 +104,17 @@ public final class ClassPathScanner
> return withConfiguration( Arrays.asList( configurations ) );
> }
>
> - public ClassLoaderBuilder withConfiguration( final Collection<HandlerConfiguration> configurations )
> + public ClassLoaderBuilder withConfiguration( final Iterable<HandlerConfiguration> configurations )
> {
> - if ( configurations == null || configurations.isEmpty() )
> + final Iterator<HandlerConfiguration> iter = configurations == null ? null : configurations.iterator();
> + if ( iter == null || !iter.hasNext())
> {
> throw new IllegalArgumentException( "Parameter 'configurations' must not be null or empty" );
> }
>
> MatcherImpl matcher = new MatcherImpl();
> - for ( HandlerConfiguration configuration : configurations )
> - {
> - configuration.configure( matcher );
> + while (iter.hasNext()) {
> + iter.next().configure( matcher );
> }
>
> final Collection<ClassPathHandler> handlers = matcher.getHandlers();
>
> Modified: commons/sandbox/meiyo/trunk/src/main/java/org/apache/commons/meiyo/classpath/HandlerConfigurationsBuilder.java
> URL: http://svn.apache.org/viewvc/commons/sandbox/meiyo/trunk/src/main/java/org/apache/commons/meiyo/classpath/HandlerConfigurationsBuilder.java?rev=1137042&r1=1137041&r2=1137042&view=diff
> ==============================================================================
> --- commons/sandbox/meiyo/trunk/src/main/java/org/apache/commons/meiyo/classpath/HandlerConfigurationsBuilder.java (original)
> +++ commons/sandbox/meiyo/trunk/src/main/java/org/apache/commons/meiyo/classpath/HandlerConfigurationsBuilder.java Fri Jun 17 21:39:46 2011
> @@ -19,8 +19,6 @@ package org.apache.commons.meiyo.classpa
> * under the License.
> */
>
> -import java.util.Collection;
> -
> /**
> * Builder to set-up the {@link ClassPathScanner} given the user defined configurations.
> */
> @@ -41,6 +39,6 @@ public interface HandlerConfigurationsBu
> * @param configurations configurations needed to set-up the scanner
> * @return the builder to set-up the scanner ClassLoader
> */
> - ClassLoaderBuilder withConfiguration( Collection<HandlerConfiguration> configurations );
> + ClassLoaderBuilder withConfiguration( Iterable<HandlerConfiguration> configurations );
>
> }
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org