You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ma...@apache.org on 2008/05/21 15:28:27 UTC
svn commit: r658678 - in
/maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime:
CompositeEnumeration.java CompoundEnumeration.java DelegatingClassLoader.java
Author: markh
Date: Wed May 21 06:28:27 2008
New Revision: 658678
URL: http://svn.apache.org/viewvc?rev=658678&view=rev
Log:
Simplified and renamed CompoundEnumeration to CompositeEnumeration
Added:
maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/CompositeEnumeration.java
- copied, changed from r656626, maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/CompoundEnumeration.java
Removed:
maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/CompoundEnumeration.java
Modified:
maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DelegatingClassLoader.java
Copied: maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/CompositeEnumeration.java (from r656626, maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/CompoundEnumeration.java)
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/CompositeEnumeration.java?p2=maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/CompositeEnumeration.java&p1=maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/CompoundEnumeration.java&r1=656626&r2=658678&rev=658678&view=diff
==============================================================================
--- maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/CompoundEnumeration.java (original)
+++ maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/CompositeEnumeration.java Wed May 21 06:28:27 2008
@@ -19,38 +19,30 @@
* under the License.
*/
-import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
/**
- * Enumeration that spans a series of other enumerations.
+ * Enumeration that spans two other enumerations.
*
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
* @param <T>
* the element type of this enumeration
*/
-public class CompoundEnumeration<T> implements Enumeration<T>
+public class CompositeEnumeration<T> implements Enumeration<T>
{
// fields -------------------------------------------------------------
- private final Iterator<Enumeration<T>> enumerations;
+ private final Enumeration<T> enumeration1;
- private Enumeration<T> enumeration;
+ private final Enumeration<T> enumeration2;
// constructors -------------------------------------------------------
- public CompoundEnumeration( Enumeration<T> enumeration1, Enumeration<T> enumeration2 )
+ public CompositeEnumeration( Enumeration<T> enumeration1, Enumeration<T> enumeration2 )
{
- this( toList( enumeration1, enumeration2 ) );
- }
-
- public CompoundEnumeration( List<Enumeration<T>> enumerations )
- {
- this.enumerations = enumerations.iterator();
+ this.enumeration1 = enumeration1;
+ this.enumeration2 = enumeration2;
}
// Enumeration methods ------------------------------------------------
@@ -60,7 +52,7 @@
*/
public boolean hasMoreElements()
{
- return ( enumeration != null && enumeration.hasMoreElements() ) || enumerations.hasNext();
+ return enumeration1.hasMoreElements() || enumeration2.hasMoreElements();
}
/**
@@ -70,33 +62,15 @@
{
T element;
- if ( enumeration != null && enumeration.hasMoreElements() )
- {
- element = enumeration.nextElement();
- }
- else if ( enumerations.hasNext() )
+ if ( enumeration1.hasMoreElements() )
{
- enumeration = enumerations.next();
-
- element = enumeration.nextElement();
+ element = enumeration1.nextElement();
}
else
{
- throw new NoSuchElementException();
+ element = enumeration2.nextElement();
}
return element;
}
-
- // private methods --------------------------------------------------------
-
- private static <T> List<T> toList( T element1, T element2 )
- {
- List<T> list = new ArrayList<T>();
-
- list.add( element1 );
- list.add( element2 );
-
- return list;
- }
}
Modified: maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DelegatingClassLoader.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DelegatingClassLoader.java?rev=658678&r1=658677&r2=658678&view=diff
==============================================================================
--- maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DelegatingClassLoader.java (original)
+++ maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DelegatingClassLoader.java Wed May 21 06:28:27 2008
@@ -135,7 +135,7 @@
{
Enumeration<URL> parentURLs = getParent().getResources( name );
- urls = new CompoundEnumeration<URL>( urls, parentURLs );
+ urls = new CompositeEnumeration<URL>( urls, parentURLs );
}
}
else