[jboss-cvs] JBossAS SVN: r95068 - in projects/annotations/trunk/core/src/main/java/org/jboss/papaki: impl and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-10-18 06:39:27 -0400 (Sun, 18 Oct 2009)
New Revision: 95068

Modified:
   projects/annotations/trunk/core/src/main/java/org/jboss/papaki/AnnotationScanner.java
   projects/annotations/trunk/core/src/main/java/org/jboss/papaki/impl/AbstractAnnotationScanner.java
Log:
Simplify AnnotationScanner interface.

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/papaki/AnnotationScanner.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/papaki/AnnotationScanner.java	2009-10-18 10:16:33 UTC (rev 95067)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/papaki/AnnotationScanner.java	2009-10-18 10:39:27 UTC (rev 95068)
@@ -37,13 +37,6 @@
    Configuration configure();
 
    /**
-    * Scan using the context class loader to resolve annotation class definitions
-    * @param urls The URLs with the .jar files
-    * @return The annotation repository
-    */
-   AnnotationRepository scan(URL[] urls);
-
-   /**
     * Scan using the context class loader as well as the additional 
     * classloaders specified to resolve annotation class definitions
     * @param urls The URLs with the .jar files

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/papaki/impl/AbstractAnnotationScanner.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/papaki/impl/AbstractAnnotationScanner.java	2009-10-18 10:16:33 UTC (rev 95067)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/papaki/impl/AbstractAnnotationScanner.java	2009-10-18 10:39:27 UTC (rev 95068)
@@ -22,7 +22,6 @@
 
 package org.jboss.papaki.impl;
 
-import org.jboss.papaki.AnnotationRepository;
 import org.jboss.papaki.AnnotationScanner;
 import org.jboss.papaki.Configuration;
 import org.jboss.papaki.Settings;
@@ -354,15 +353,4 @@
 
       return include;
    }
-
-   /**
-    * Scan
-    *
-    * @param urls The URLs with class files
-    * @return The map of annotations
-    */
-   public AnnotationRepository scan(URL[] urls)
-   {
-      return scan(urls, (ClassLoader)null);
-   }
 }