[jboss-cvs] JBossAS SVN: r87860 - projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations.

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

Author: adrian at jboss.org
Date: 2009-04-27 07:55:24 -0400 (Mon, 27 Apr 2009)
New Revision: 87860

Modified:
   projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/AnnotationPluginFilter.java
   projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/MethodAnnotationPluginFilter.java
   projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/PropertyAnnotationPluginFilter.java
Log:
Sourcecode tidyup

Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/AnnotationPluginFilter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/AnnotationPluginFilter.java	2009-04-27 11:47:23 UTC (rev 87859)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/AnnotationPluginFilter.java	2009-04-27 11:55:24 UTC (rev 87860)
@@ -21,6 +21,10 @@
  */
 package org.jboss.kernel.plugins.annotations;
 
+import java.lang.annotation.Annotation;
+
+import org.jboss.reflect.spi.AnnotatedInfo;
+
 /**
  * Filter annotation plugins.
  *
@@ -34,5 +38,5 @@
     * @param plugin the current plugin
     * @return true if we match the plugin, false otherwise
     */
-   boolean accept(MetaDataAnnotationPlugin plugin);
+   boolean accept(MetaDataAnnotationPlugin<? extends AnnotatedInfo, ? extends Annotation> plugin);
 }

Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/MethodAnnotationPluginFilter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/MethodAnnotationPluginFilter.java	2009-04-27 11:47:23 UTC (rev 87859)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/MethodAnnotationPluginFilter.java	2009-04-27 11:55:24 UTC (rev 87860)
@@ -21,12 +21,16 @@
  */
 package org.jboss.kernel.plugins.annotations;
 
+import java.lang.annotation.Annotation;
+
+import org.jboss.reflect.spi.AnnotatedInfo;
+
 /**
  * Match only true method.
  */
 class MethodAnnotationPluginFilter extends PropertyAnnotationPluginFilter
 {
-   public boolean accept(MetaDataAnnotationPlugin plugin)
+   public boolean accept(MetaDataAnnotationPlugin<? extends AnnotatedInfo, ? extends Annotation> plugin)
    {
       // negate
       return super.accept(plugin) == false;

Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/PropertyAnnotationPluginFilter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/PropertyAnnotationPluginFilter.java	2009-04-27 11:47:23 UTC (rev 87859)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/PropertyAnnotationPluginFilter.java	2009-04-27 11:55:24 UTC (rev 87860)
@@ -21,12 +21,16 @@
  */
 package org.jboss.kernel.plugins.annotations;
 
+import java.lang.annotation.Annotation;
+
+import org.jboss.reflect.spi.AnnotatedInfo;
+
 /**
  * Match only properties.
  */
 class PropertyAnnotationPluginFilter implements AnnotationPluginFilter
 {
-   public boolean accept(MetaDataAnnotationPlugin plugin)
+   public boolean accept(MetaDataAnnotationPlugin<? extends AnnotatedInfo, ? extends Annotation> plugin)
    {
       return (plugin instanceof PropertyAware);
    }