Disposal Methods oops...

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2307 1c488680-804c-0410-94cd-c6b725194a0e
weld · Apr 5, 2009 · 677ee4a · 677ee4a
1 parent 94d70eb
commit 677ee4a
Showing 1 changed file with 25 additions and 12 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java b/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java
@@ -14,15 +14,13 @@
 import javax.inject.Disposes;
 import javax.inject.Initializer;
 import javax.inject.Produces;
-import javax.inject.manager.Bean;
 import javax.inject.manager.InjectionPoint;
 
 import org.jboss.webbeans.ManagerImpl;
 import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
 import org.jboss.webbeans.injection.AnnotatedInjectionPoint;
 import org.jboss.webbeans.injection.MethodInjectionPoint;
 import org.jboss.webbeans.injection.ParameterInjectionPoint;
-import org.jboss.webbeans.introspector.AnnotatedItem;
 import org.jboss.webbeans.introspector.AnnotatedMethod;
 import org.jboss.webbeans.introspector.AnnotatedParameter;
 
@@ -38,8 +36,8 @@ protected DisposalMethodBean(ManagerImpl manager, AnnotatedMethod<T> disposalMet
       initInjectionPoints();
       initType();
       initTypes();
-      this.id = createId("DisposalMethod-" + declaringBean.getName() + "-"+ disposalMethod.getSignature().toString());
-      
+      this.id = createId("DisposalMethod-" + declaringBean.getName() + "-" + disposalMethod.getSignature().toString());
+
    }
 
    protected AbstractClassBean<?> declaringBean;
@@ -53,10 +51,11 @@ protected void initType()
       this.type = (Class<T>) disposalMethodInjectionPoint.getAnnotatedParameters(Disposes.class).get(0).getRawType();
    }
 
-   public AnnotatedMethod<T> getAnnotatedItem() {
-	   return disposalMethodInjectionPoint;
+   public AnnotatedMethod<T> getAnnotatedItem()
+   {
+      return disposalMethodInjectionPoint;
    }
-   
+
    public static <T> DisposalMethodBean<T> of(ManagerImpl manager, AnnotatedMethod<T> disposalMethod, AbstractClassBean<?> declaringBean)
    {
       return new DisposalMethodBean<T>(manager, disposalMethod, declaringBean);
@@ -95,6 +94,20 @@ public Class<? extends Annotation> getDeploymentType()
       return declaringBean.getDeploymentType();
    }
 
+   /**
+    * Initializes the API types
+    */
+   @Override
+   protected void initTypes()
+   {
+      Set<Type> types = new HashSet<Type>();
+      types = new HashSet<Type>();
+      types.addAll(disposalMethodInjectionPoint.getAnnotatedParameters(Disposes.class).get(0).getFlattenedTypeHierarchy());
+      types.add(getType());
+      types.add(Object.class);
+      super.types = types;
+   }
+
    public Set<AnnotatedInjectionPoint<?, ?>> getInjectionPoints()
    {
       return injectionPoints;
@@ -143,7 +156,7 @@ public T create(CreationalContext<T> creationalContext)
 
    public void invokeDisposeMethod(Object instance)
    {
-	   
+
       List<Object> parameters = new LinkedList<Object>();
 
       parameters.add(instance);
@@ -158,11 +171,11 @@ public void invokeDisposeMethod(Object instance)
 
       try
       {
-    	  disposalMethodInjectionPoint.invoke(beanInstance, parameters.toArray());
+         disposalMethodInjectionPoint.invoke(beanInstance, parameters.toArray());
       }
       catch (Exception e)
       {
-         // TODO: 
+         // TODO:
       }
 
    }
@@ -234,8 +247,8 @@ protected void specialize(BeanDeployerEnvironment environment)
          throw new IllegalStateException(toString() + " does not specialize a bean");
       }
       this.specializedBean = environment.getProducerMethod(superClassMethod);
-   }   
-   
+   }
+
    @Override
    public Class<T> getType()
    {