[jboss-cvs] JBossAS SVN: r106052 - projects/jboss-jsf-int/trunk/jboss-faces/src/main/java/org/jboss/web/jsf/integration/config.

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

Author: alesj
Date: 2010-06-15 09:19:07 -0400 (Tue, 15 Jun 2010)
New Revision: 106052

Modified:
   projects/jboss-jsf-int/trunk/jboss-faces/src/main/java/org/jboss/web/jsf/integration/config/JBossAnnotationProvider.java
Log:
Fix urls usage.
TODO on the actual / real urls usage.


Modified: projects/jboss-jsf-int/trunk/jboss-faces/src/main/java/org/jboss/web/jsf/integration/config/JBossAnnotationProvider.java
===================================================================
--- projects/jboss-jsf-int/trunk/jboss-faces/src/main/java/org/jboss/web/jsf/integration/config/JBossAnnotationProvider.java	2010-06-15 13:01:45 UTC (rev 106051)
+++ projects/jboss-jsf-int/trunk/jboss-faces/src/main/java/org/jboss/web/jsf/integration/config/JBossAnnotationProvider.java	2010-06-15 13:19:07 UTC (rev 106052)
@@ -102,18 +102,17 @@
       return connector.getUtility();
    }
 
-
+   /**
+    * TODO -- handle additional urls?
+    */
    public Map<Class<? extends Annotation>, Set<Class<?>>> getAnnotatedClasses(Set<URL> urls)
    {
       if (index != null)
       {
          Map<Class<? extends Annotation>, Set<Class<?>>> result = new HashMap<Class<? extends Annotation>, Set<Class<?>>>();
-         for (URL url : urls)
+         for (Class<? extends Annotation> annotationClass : JSF_ANNOTATIONS)
          {
-            for (Class<? extends Annotation> annotationClass : JSF_ANNOTATIONS)
-            {
-               fillResults(result, annotationClass, url);
-            }
+            fillResults(result, annotationClass, null);
          }
          return result;
       }
@@ -123,6 +122,13 @@
       }
    }
 
+   /**
+    * Add new results to existing result map.
+    *
+    * @param result the existing result map
+    * @param annotationClass the annotation to look for
+    * @param url the url to match, can be null
+    */
    protected <T extends Annotation> void fillResults(Map<Class<? extends Annotation>, Set<Class<?>>> result, Class<T> annotationClass, URL url)
    {
       Set<Class<?>> classes = new HashSet<Class<?>>();