[weld-commits] Weld SVN: r6241 - in java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery: handlers and 1 other directory.

Author: pete.muir(a)jboss.org Date: 2010-05-18 10:48:15 -0400 (Tue, 18 May 2010) New Revision: 6241 Modified: java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/Scanner.java java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/URLScanner.java java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/handlers/FileSystemURLHandler.java java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/handlers/URLHandler.java Log: remove undeeded scanDirectories Modified: java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/Scanner.java =================================================================== --- java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/Scanner.java 2010-05-18 14:44:05 UTC (rev 6240) +++ java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/Scanner.java 2010-05-18 14:48:15 UTC (rev 6241) @@ -16,7 +16,6 @@ */ package org.jboss.weld.environment.se.discovery; -import java.io.File; /** * The Scanner is used to find resources to be processed by Seam @@ -28,12 +27,6 @@ */ public interface Scanner { - /** - * Recursively scan directories. - * - * @param directories An array of the roots of the directory trees to scan - */ - public void scanDirectories(File[] directories); /** * Scan for structures which contain any of the given resources in their root Modified: java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/URLScanner.java =================================================================== --- java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/URLScanner.java 2010-05-18 14:44:05 UTC (rev 6240) +++ java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/URLScanner.java 2010-05-18 14:48:15 UTC (rev 6241) @@ -16,8 +16,6 @@ */ package org.jboss.weld.environment.se.discovery; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import java.io.File; import java.io.UnsupportedEncodingException; import java.net.URL; @@ -26,14 +24,17 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.jboss.weld.environment.se.discovery.handlers.URLHandler; + import org.jboss.weld.environment.se.discovery.handlers.FileSystemURLHandler; +import org.jboss.weld.environment.se.discovery.handlers.URLHandler; import org.jboss.weld.environment.se.exceptions.ClasspathScanningException; import org.jboss.weld.resources.spi.ResourceLoader; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + /** * Implementation of {@link Scanner} which can scan a {@link URLClassLoader} * @@ -65,15 +66,6 @@ urlHandlers.put(type, handler); } - public void scanDirectories(File[] directories) - { - for (File directory : directories) - { - // can only use a file-based scanner to scan directories - urlHandlers.get(FILE).handleDirectory(directory); - } - } - public void scanResources(String[] resources) { Multimap<String, String> paths = HashMultimap.create(); Modified: java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/handlers/FileSystemURLHandler.java =================================================================== --- java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/handlers/FileSystemURLHandler.java 2010-05-18 14:44:05 UTC (rev 6240) +++ java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/handlers/FileSystemURLHandler.java 2010-05-18 14:48:15 UTC (rev 6241) @@ -25,6 +25,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipException; import java.util.zip.ZipFile; + import org.jboss.weld.environment.se.discovery.SEWeldDiscovery; import org.jboss.weld.environment.se.discovery.Scanner; import org.jboss.weld.resources.spi.ResourceLoader; @@ -103,11 +104,6 @@ } } - public void handleDirectory(File file) - { - handleDirectory(file, null); - } - protected void handleDirectory(File file, String path) { handleDirectory(file, path, new File[0]); Modified: java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/handlers/URLHandler.java =================================================================== --- java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/handlers/URLHandler.java 2010-05-18 14:44:05 UTC (rev 6240) +++ java-se/trunk/src/main/java/org/jboss/weld/environment/se/discovery/handlers/URLHandler.java 2010-05-18 14:48:15 UTC (rev 6241) @@ -16,7 +16,6 @@ */ package org.jboss.weld.environment.se.discovery.handlers; -import java.io.File; import java.util.Collection; /** @@ -27,6 +26,4 @@ void handle(Collection<String> paths); - void handleDirectory(File file); - }