[webbeans-commits] Webbeans SVN: r2794 - in ri/trunk: impl/src/main/java/org/jboss/webbeans and 2 other directories.

Author: pete.muir(a)jboss.org Date: 2009-06-08 18:16:53 -0400 (Mon, 08 Jun 2009) New Revision: 2794 Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/BeansImpl.java Log: Tidy up Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-06-08 20:33:56 UTC (rev 2793) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-06-08 22:16:53 UTC (rev 2794) @@ -117,7 +117,7 @@ * The Bean representation of the bean. * @return the mest specialized enabled bean */ - public <X> Bean<X> getMostSpecializedBean(Bean<X> bean); + public <X> Bean<? extends X> getMostSpecializedBean(Bean<X> bean); /** * Returns the PassivationCapableBean with the given identifier. Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-06-08 20:33:56 UTC (rev 2793) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-06-08 22:16:53 UTC (rev 2794) @@ -700,26 +700,8 @@ throw new IllegalStateException("More than one context active for scope type " + scopeType.getName()); } return activeContexts.iterator().next(); - } - @Deprecated - public <T> T getInstance(Bean<T> bean) - { - return getInstance(bean, true); } - - @Deprecated - public <T> T getInstance(Bean<T> bean, boolean create) - { - if (create) - { - return (T) getInjectableReference(bean, CreationalContextImpl.of(bean)); - } - else - { - return (T) getInjectableReference(bean, null); - } - } public Object getInjectableReference(Bean<?> bean, CreationalContext<?> creationalContext) { @@ -836,7 +818,7 @@ @Deprecated public <T> T getInstanceByType(AnnotatedItem<T, ?> element, Annotation... bindings) { - return getInstance(getBean(element, bindings)); + return (T) getReference(getBean(element, bindings), element.getType()); } public <T> Bean<T> getBean(AnnotatedItem<T, ?> element, Annotation... bindings) @@ -1112,7 +1094,7 @@ - public <X> Bean<X> getMostSpecializedBean(Bean<X> bean) + public <X> Bean<? extends X> getMostSpecializedBean(Bean<X> bean) { Bean<?> key = bean; while (specializedBeans.containsKey(key)) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-06-08 20:33:56 UTC (rev 2793) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-06-08 22:16:53 UTC (rev 2794) @@ -325,7 +325,7 @@ return creationalContextImpl.getIncompleteInstance(getDeclaringBean()); } } - return manager.getInstance(getDeclaringBean()); + return manager.getReference(getDeclaringBean(), getDeclaringBean().getType()); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-06-08 20:33:56 UTC (rev 2793) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-06-08 22:16:53 UTC (rev 2794) @@ -182,7 +182,8 @@ public void invokeDisposeMethod(Object instance, CreationalContext<?> creationalContext) { - Object beanInstance = disposalMethodInjectionPoint.isStatic() ? declaringBean : getManager().getInstance(declaringBean); + // TODO WTF - why isn't this using getReceiver!? Why is it assigning the beanInstance as the beanObject!?! + Object beanInstance = disposalMethodInjectionPoint.isStatic() ? declaringBean : getManager().getReference(declaringBean, declaringBean.getType()); disposalMethodInjectionPoint.invokeWithSpecialValue(beanInstance, Disposes.class, instance, manager, creationalContext, IllegalArgumentException.class); } Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/BeansImpl.java =================================================================== --- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/BeansImpl.java 2009-06-08 20:33:56 UTC (rev 2793) +++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/BeansImpl.java 2009-06-08 22:16:53 UTC (rev 2794) @@ -83,7 +83,7 @@ public <T> T createBeanInstance(Bean<T> bean) { - return CurrentManager.rootManager().getCurrent().getInstance(bean, true); + return (T) CurrentManager.rootManager().getCurrent().getReference(bean, Object.class); } public <T> void destroyAndRemoveBeanInstance(Bean<T> bean, T instance)