donaldp 01/11/17 03:33:54
Modified: src/scratchpad/org/apache/avalon/excalibur/extension
PackageManager.java
Log:
Add in check to see if required extensions are one of the ones passed in as
available.
Revision Changes Path
1.5 +14 -3
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/extension/PackageManager.java
Index: PackageManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/extension/PackageManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PackageManager.java 2001/11/17 05:22:07 1.4
+++ PackageManager.java 2001/11/17 11:33:54 1.5
@@ -19,7 +19,7 @@
* directories.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.4 $ $Date: 2001/11/17 05:22:07 $
+ * @version $Revision: 1.5 $ $Date: 2001/11/17 11:33:54 $
* @see PackageRepository
*/
public class PackageManager
@@ -180,9 +180,20 @@
final List dependencies,
final List unsatisfied )
{
- final int size = dependencies.size();
+ //Check to see if extension is satisifed by the
+ //list of available extensions passed in
+ for( int i = 0; i < available.length; i++ )
+ {
+ final Extension other = available[ i ];
+ if( other.isCompatibleWith( required ) )
+ {
+ return;
+ }
+ }
- //Check to make sure one of the already existing
+ //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 OptionalPackage optionalPackage =
(OptionalPackage)dependencies.get( i );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
