WELDSE-26: Renamed ClassHandler to URLHandler

weld · May 17, 2010 · 3fd6601 · 3fd6601
1 parent e91ce1c
commit 3fd6601
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/main/java/org/jboss/weld/environment/se/discovery/URLScanner.java b/src/main/java/org/jboss/weld/environment/se/discovery/URLScanner.java
@@ -26,8 +26,8 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import org.jboss.weld.environment.se.discovery.handlers.ClassHandler;
-import org.jboss.weld.environment.se.discovery.handlers.FileSystemClassHandler;
+import org.jboss.weld.environment.se.discovery.handlers.URLHandler;
+import org.jboss.weld.environment.se.discovery.handlers.FileSystemURLHandler;
 import org.jboss.weld.environment.se.exceptions.ClasspathScanningException;
 import org.jboss.weld.resources.spi.ResourceLoader;
 
@@ -49,18 +49,18 @@ public class URLScanner extends AbstractScanner
 
    private static final String FILE = "file";
    private static final String JAR = "jar";
-   private final Map<String, ClassHandler> classHandlers = new HashMap<String, ClassHandler>();
+   private final Map<String, URLHandler> classHandlers = new HashMap<String, URLHandler>();
    private static final Logger log = LoggerFactory.getLogger(URLScanner.class);
 
    public URLScanner(ResourceLoader resourceLoader, SEWeldDiscovery weldDiscovery)
    {
       super(resourceLoader, weldDiscovery);
-      ClassHandler fileSysHandler = new FileSystemClassHandler(resourceLoader, weldDiscovery);
+      URLHandler fileSysHandler = new FileSystemURLHandler(resourceLoader, weldDiscovery);
       classHandlers.put(FILE, fileSysHandler);
       classHandlers.put(JAR, fileSysHandler);
    }
 
-   public void setClassHandler(String type, ClassHandler handler)
+   public void setClassHandler(String type, URLHandler handler)
    {
       classHandlers.put(type, handler);
    }
@@ -118,7 +118,7 @@ public void scanResources(String[] resources)
       for (String urlType : paths.keySet())
       {
          Collection<String> urlPaths = paths.get(urlType);
-         ClassHandler handler = classHandlers.get(urlType);
+         URLHandler handler = classHandlers.get(urlType);
          if (handler == null)
          {
             throw new ClasspathScanningException("No handler defined for URL type: " + urlType);

diff --git a/...covery/handlers/AbstractClassHandler.java → ...iscovery/handlers/AbstractURLHandler.java b/...covery/handlers/AbstractClassHandler.java → ...iscovery/handlers/AbstractURLHandler.java
@@ -23,13 +23,13 @@
  *
  * @author Peter Royle
  */
-public abstract class AbstractClassHandler implements ClassHandler
+public abstract class AbstractURLHandler implements URLHandler
 {
 
    private final ResourceLoader resourceLoader;
    private final SEWeldDiscovery weldDiscovery;
 
-   public AbstractClassHandler(ResourceLoader resourceLoader, SEWeldDiscovery webBeanDiscovery)
+   public AbstractURLHandler(ResourceLoader resourceLoader, SEWeldDiscovery webBeanDiscovery)
    {
       this.resourceLoader = resourceLoader;
       this.weldDiscovery = webBeanDiscovery;

diff --git a/...very/handlers/FileSystemClassHandler.java → ...covery/handlers/FileSystemURLHandler.java b/...very/handlers/FileSystemClassHandler.java → ...covery/handlers/FileSystemURLHandler.java
@@ -39,12 +39,12 @@
  * @author Pete Muir
  * 
  */
-public class FileSystemClassHandler extends AbstractClassHandler
+public class FileSystemURLHandler extends AbstractURLHandler
 {
 
-   private static final Logger log = LoggerFactory.getLogger(FileSystemClassHandler.class);
+   private static final Logger log = LoggerFactory.getLogger(FileSystemURLHandler.class);
 
-   public FileSystemClassHandler(ResourceLoader resourceLoader, SEWeldDiscovery webBeanDiscovery)
+   public FileSystemURLHandler(ResourceLoader resourceLoader, SEWeldDiscovery webBeanDiscovery)
    {
       super(resourceLoader, webBeanDiscovery);
    }
@@ -55,7 +55,7 @@ public void handle(Collection<String> paths)
       {
          try
          {
-            FileSystemClassHandler.log.trace("scanning: " + urlPath);
+            FileSystemURLHandler.log.trace("scanning: " + urlPath);
 
             if (urlPath.startsWith("file:"))
             {
@@ -76,7 +76,7 @@ public void handle(Collection<String> paths)
             }
          } catch (IOException ioe)
          {
-            FileSystemClassHandler.log.warn("could not read entries", ioe);
+            FileSystemURLHandler.log.warn("could not read entries", ioe);
          }
       }
    }

diff --git a/...t/se/discovery/handlers/ClassHandler.java → ...ent/se/discovery/handlers/URLHandler.java b/...t/se/discovery/handlers/ClassHandler.java → ...ent/se/discovery/handlers/URLHandler.java
@@ -20,10 +20,10 @@
 import java.util.Collection;
 
 /**
- * Interface for handling class resolving.
+ * Interface for handling URL resolving.
  * @author Peter Royle
  */
-public interface ClassHandler {
+public interface URLHandler {
 
    void handle(Collection<String> paths);