[jboss-cvs] jboss-seam/src/main/org/jboss/seam/init ...

[Peter Muir]

  User: pmuir   
  Date: 07/05/04 07:31:36

  Modified:    src/main/org/jboss/seam/init  ComponentDescriptor.java
  Log:
  JBSEAM-1054, JBSEAM-1281
  
  Revision  Changes    Path
  1.2       +11 -3     jboss-seam/src/main/org/jboss/seam/init/ComponentDescriptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ComponentDescriptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/ComponentDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ComponentDescriptor.java	10 Mar 2007 05:50:40 -0000	1.1
  +++ ComponentDescriptor.java	4 May 2007 11:31:36 -0000	1.2
  @@ -2,8 +2,6 @@
   
   import java.util.Comparator;
   
  -import javax.servlet.Filter;
  -
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.AutoCreate;
  @@ -156,7 +154,17 @@
   
       public boolean isFilter()
       {
  -        return Filter.class.isAssignableFrom(componentClass);
  +        if (javax.servlet.Filter.class.isAssignableFrom(componentClass))
  +        {
  +           for (Class clazz = componentClass; !Object.class.equals(clazz); clazz = clazz.getSuperclass())
  +           {
  +              if (clazz.isAnnotationPresent(org.jboss.seam.annotations.Filter.class))
  +              {
  +                 return true;
  +              }
  +           }
  +        }
  +        return false;
       }
   
       public boolean isResourceProvider()