[jboss-cvs] JBossAS SVN: r97491 - in projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata: plugins/loader and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Dec 7 04:42:14 EST 2009


Author: alesj
Date: 2009-12-07 04:42:14 -0500 (Mon, 07 Dec 2009)
New Revision: 97491

Modified:
   projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/context/AbstractMetaDataContext.java
   projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/loader/AbstractMetaDataLoader.java
   projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/loader/AnnotationsAnnotatedWithCache.java
   projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/MetaData.java
   projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java
   projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsFilter.java
   projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java
Log:
Simple cleanup.

Modified: projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/context/AbstractMetaDataContext.java
===================================================================
--- projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/context/AbstractMetaDataContext.java	2009-12-07 09:10:44 UTC (rev 97490)
+++ projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/context/AbstractMetaDataContext.java	2009-12-07 09:42:14 UTC (rev 97491)
@@ -329,10 +329,13 @@
 
       return null;
    }
-   
+
+   /**
+    * Only match annotations with meta annotation.
+    */
    private static class AnnotationsAnnotatedWithFilter implements CummulativeAnnotationsFilter
    {
-      Class<? extends Annotation> meta;
+      private Class<? extends Annotation> meta;
       
       public AnnotationsAnnotatedWithFilter(Class<? extends Annotation> meta)
       {

Modified: projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/loader/AbstractMetaDataLoader.java
===================================================================
--- projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/loader/AbstractMetaDataLoader.java	2009-12-07 09:10:44 UTC (rev 97490)
+++ projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/loader/AbstractMetaDataLoader.java	2009-12-07 09:42:14 UTC (rev 97491)
@@ -113,13 +113,14 @@
       return cache;
    }
 
+   @SuppressWarnings({"unchecked"})
    public AnnotationsItem retrieveAnnotationsAnnotatedWith(Class<? extends Annotation> meta)
    {
       AnnotationsItem item = getAnnotationsAnnotatedWithCache().getAnnotationsAnnotatedWith(meta);
       if (item == null)
       {
          AnnotationsItem annotations = retrieveAnnotations();
-         List<AnnotationItem<? extends Annotation>> values = new ArrayList<AnnotationItem<? extends Annotation>>(annotations.getAnnotations().length);
+         List<AnnotationItem<? extends Annotation>> values = new ArrayList<AnnotationItem<? extends Annotation>>();
          for (AnnotationItem<? extends Annotation> current : annotations.getAnnotations())
          {
             for (Annotation ann : current.getAnnotation().annotationType().getAnnotations())
@@ -188,7 +189,10 @@
       validTime.invalidate();
       invalidateAnnotationsAnnotatedWithCache();
    }
-   
+
+   /**
+    * Invalidate cache.
+    */
    protected void invalidateAnnotationsAnnotatedWithCache()
    {
       if (cache != null)

Modified: projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/loader/AnnotationsAnnotatedWithCache.java
===================================================================
--- projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/loader/AnnotationsAnnotatedWithCache.java	2009-12-07 09:10:44 UTC (rev 97490)
+++ projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/loader/AnnotationsAnnotatedWithCache.java	2009-12-07 09:42:14 UTC (rev 97491)
@@ -28,15 +28,16 @@
 import org.jboss.metadata.spi.retrieval.AnnotationsItem;
 
 /**
- * 
+ * Annotations cache.
+ *
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision: 1.1 $
  */
-public class AnnotationsAnnotatedWithCache
+class AnnotationsAnnotatedWithCache
 {
    private ConcurrentMap<Class<? extends Annotation>, AnnotationsItem> annotationsByMetaAnnotation = new ConcurrentHashMap<Class<? extends Annotation>, AnnotationsItem>();
    
-   public AnnotationsItem getAnnotationsAnnotatedWith(Class<? extends Annotation> meta)
+   AnnotationsItem getAnnotationsAnnotatedWith(Class<? extends Annotation> meta)
    {
        AnnotationsItem annotationsItem = annotationsByMetaAnnotation.get(meta);
        if (annotationsItem != null)
@@ -44,12 +45,12 @@
        return null;
    }
    
-   public void addAnnotationsAnnotatedWith(Class<? extends Annotation> meta, AnnotationsItem item)
+   void addAnnotationsAnnotatedWith(Class<? extends Annotation> meta, AnnotationsItem item)
    {
       annotationsByMetaAnnotation.putIfAbsent(meta, item);
    }
    
-   public void invalidate()
+   void invalidate()
    {
       annotationsByMetaAnnotation.clear();
    }

Modified: projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/MetaData.java
===================================================================
--- projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/MetaData.java	2009-12-07 09:10:44 UTC (rev 97490)
+++ projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/MetaData.java	2009-12-07 09:42:14 UTC (rev 97491)
@@ -81,7 +81,7 @@
    /**
     * Get all the annotations annotated with the given meta annotation
     * 
-    * @param the meta annotation
+    * @param meta the meta annotation
     * @return the annotations annotated with the meta annotation
     */
    Annotation[] getAnnotationsAnnotatedWith(Class<? extends Annotation> meta);

Modified: projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java
===================================================================
--- projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java	2009-12-07 09:10:44 UTC (rev 97490)
+++ projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java	2009-12-07 09:42:14 UTC (rev 97491)
@@ -62,12 +62,11 @@
     * @return the annotations
     */
    AnnotationsItem retrieveLocalAnnotations();
-   
-   
+
    /**
     * Get all the annotations annotated with the given meta annotation
     * 
-    * @param the meta annotation
+    * @param meta the meta annotation
     * @return the annotations annotated with the meta annotation
     */
    AnnotationsItem retrieveAnnotationsAnnotatedWith(Class<? extends Annotation> meta);

Modified: projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsFilter.java
===================================================================
--- projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsFilter.java	2009-12-07 09:10:44 UTC (rev 97490)
+++ projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsFilter.java	2009-12-07 09:42:14 UTC (rev 97491)
@@ -25,11 +25,18 @@
 import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
 
 /**
- * 
+ * Annotations filter.
+ *
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision: 1.1 $
  */
 public interface CummulativeAnnotationsFilter
 {
+   /**
+    * Get annotation items.
+    *
+    * @param retrieval the retrieval
+    * @return matching annotation items
+    */
    AnnotationsItem getAnnotations(MetaDataRetrieval retrieval);
 }

Modified: projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java
===================================================================
--- projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java	2009-12-07 09:10:44 UTC (rev 97490)
+++ projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java	2009-12-07 09:42:14 UTC (rev 97491)
@@ -67,6 +67,7 @@
     * 
     * @param context the context
     * @param includeParent whether to include the parent
+    * @param filter the annotations filter
     */
    public CummulativeAnnotationsItem(MetaDataContext context, boolean includeParent, CummulativeAnnotationsFilter filter)
    {




More information about the jboss-cvs-commits mailing list