Author: pete.muir(a)jboss.org Date: 2009-03-23 15:52:41 -0400 (Mon, 23 Mar 2009) New Revision: 2156 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java Log: stubs for disposal method propagation Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-03-23 19:52:20 UTC (rev 2155) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-03-23 19:52:41 UTC (rev 2156) @@ -128,7 +128,7 @@ /** * Initializes the remove method */ - protected void initDisposalMethod() + protected void initDisposalMethod(BeanDeployerEnvironment environment) { Set<AnnotatedMethod<?>> disposalMethods = manager.resolveDisposalMethods(getType(), getBindings().toArray(new Annotation[0])); if (disposalMethods.size() == 1) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-03-23 19:52:20 UTC (rev 2155) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-03-23 19:52:41 UTC (rev 2156) @@ -135,6 +135,7 @@ createProducerMethods(bean, annotatedClass); createProducerFields(bean, annotatedClass); createObserverMethods(bean, annotatedClass); + createDisposalMethods(bean, annotatedClass); if (annotatedClass.isAnnotationPresent(Realizes.class)) { @@ -153,6 +154,11 @@ } } + private void createDisposalMethods(AbstractClassBean<?> declaringBean, AnnotatedClass<?> annotatedClass) + { + + } + private <T> void createProducerMethod(AbstractClassBean<?> declaringBean, AnnotatedMethod<T> annotatedMethod) { ProducerMethodBean<T> bean = ProducerMethodBean.of(annotatedMethod, declaringBean, manager); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java 2009-03-23 19:52:20 UTC (rev 2155) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java 2009-03-23 19:52:41 UTC (rev 2156) @@ -26,11 +26,13 @@ private final Map<AnnotatedMethod<?>, ProducerMethodBean<?>> methodBeanMap; private final Set<RIBean<?>> beans; private final Set<ObserverImpl<?>> observers; - + private final Set<AnnotatedMethod<?>> disposalMethods; + public BeanDeployerEnvironment() { this.classBeanMap = new HashMap<AnnotatedClass<?>, AbstractClassBean<?>>(); this.methodBeanMap = new HashMap<AnnotatedMethod<?>, ProducerMethodBean<?>>(); + this.disposalMethods = new HashSet<AnnotatedMethod<?>>(); this.beans = new HashSet<RIBean<?>>(); this.observers = new HashSet<ObserverImpl<?>>(); } @@ -70,4 +72,9 @@ return observers; } + public Set<AnnotatedMethod<?>> getDisposalMethods() + { + return disposalMethods; + } + }