CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/components/extensions/pkgmgr PackageManager.java,1.3,1.4

Peter Donald <pdonald-yCVjj/[email protected]> Tue, 11 Nov 2003 05:29:53 -0600
Newsgroups gmane.comp.java.jcontainer.cvs
Message-ID <[email protected]>
Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/extensions/pkgmgr
In directory hogshead.codehaus.org:/tmp/cvs-serv19546/src/java/org/jcontainer/loom/components/extensions/pkgmgr

Modified Files:
	PackageManager.java 
Log Message:
Start to update to use more recent version of ClassMan


Index: PackageManager.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/extensions/pkgmgr/PackageManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PackageManager.java	17 Aug 2003 18:27:32 -0000	1.3
+++ PackageManager.java	11 Nov 2003 11:29:51 -0000	1.4
@@ -86,8 +86,9 @@
  */
 package org.jcontainer.loom.components.extensions.pkgmgr;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 import org.realityforge.extension.Extension;
 
 /**
@@ -200,14 +201,15 @@
                                                final Extension[] available )
         throws UnsatisfiedExtensionException
     {
-        final ArrayList dependencies = new ArrayList();
-        final ArrayList unsatisfied = new ArrayList();
+        final Set dependencies = new HashSet();
+        final Set unsatisfied = new HashSet();
 
         scanDependencies( required, available, dependencies, unsatisfied );
 
         if( 0 != unsatisfied.size() )
         {
-            final Extension extension = (Extension)unsatisfied.get( 0 );
+            final Extension extension =
+                (Extension)unsatisfied.iterator().next();
             throw new UnsatisfiedExtensionException( extension );
         }
 
@@ -233,8 +235,8 @@
      */
     public void scanDependencies( final Extension[] required,
                                   final Extension[] available,
-                                  final List dependencies,
-                                  final List unsatisfied )
+                                  final Set dependencies,
+                                  final Set unsatisfied )
     {
         for( int i = 0; i < required.length; i++ )
         {
@@ -261,8 +263,8 @@
      */
     public void scanDependencies( final Extension required,
                                   final Extension[] available,
-                                  final List dependencies,
-                                  final List unsatisfied )
+                                  final Set dependencies,
+                                  final Set unsatisfied )
     {
         //Check to see if extension is satisifed by the
         //list of available extensions passed in
@@ -277,10 +279,10 @@
 
         //Check to see if extension is satisifed by one
         //of the extensions already found
-        final int size = dependencies.size();
-        for( int i = 0; i < size; i++ )
+        final Iterator iterator = dependencies.iterator();
+        while( iterator.hasNext() )
         {
-            final OptionalPackage optionalPackage = (OptionalPackage)dependencies.get( i );
+            final OptionalPackage optionalPackage = (OptionalPackage)iterator.next();
             if( optionalPackage.isCompatible( required ) )
             {
                 return;