svn commit: r723574 - in /archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled: DefaultArchivaTaskScheduler.java tasks/RepositoryTaskSelectionPredicate.java

[brett]

Author: brett
Date: Thu Dec  4 20:07:12 2008
New Revision: 723574

URL: http://svn.apache.org/viewvc?rev=723574&view=rev
Log:
remove one-use predicate

Removed:
    
archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/RepositoryTaskSelectionPredicate.java
Modified:
    
archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java

Modified: 
archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java?rev=723574&r1=723573&r2=723574&view=diff
==============================================================================
--- 
archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
 (original)
+++ 
archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
 Thu Dec  4 20:07:12 2008
@@ -19,8 +19,14 @@
  * under the License.
  */
 
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import org.apache.archiva.repository.scanner.RepositoryScanStatistics;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.common.ArchivaException;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.ConfigurationEvent;
@@ -31,7 +37,6 @@
 import org.apache.maven.archiva.scheduled.tasks.ArchivaTask;
 import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
 import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
-import 
org.apache.maven.archiva.scheduled.tasks.RepositoryTaskSelectionPredicate;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
 import 
org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
 import 
org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException;
@@ -48,12 +53,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 /**
  * Default implementation of a scheduling component for archiva.
  *
@@ -345,7 +344,19 @@
             throw new ArchivaException( "Unable to get repository scanning 
queue:" + e.getMessage(), e );
         }
 
-        return CollectionUtils.exists( queue, new 
RepositoryTaskSelectionPredicate( repositoryId ) );
+        for ( Task t : queue )
+        {
+            if ( t instanceof RepositoryTask )
+            {
+                RepositoryTask task = (RepositoryTask) t;
+                if ( StringUtils.equals( repositoryId, task.getRepositoryId() 
) )
+                {
+                    return true;
+                }
+            }
+        }
+        
+        return false;
     }
 
     public boolean isProcessingDatabaseTask()