Return-Path: Delivered-To: apmail-incubator-openwebbeans-commits-archive@minotaur.apache.org Received: (qmail 69745 invoked from network); 27 Jan 2009 21:48:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Jan 2009 21:48:56 -0000 Received: (qmail 81706 invoked by uid 500); 27 Jan 2009 21:48:56 -0000 Delivered-To: apmail-incubator-openwebbeans-commits-archive@incubator.apache.org Received: (qmail 81686 invoked by uid 500); 27 Jan 2009 21:48:56 -0000 Mailing-List: contact openwebbeans-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: openwebbeans-dev@incubator.apache.org Delivered-To: mailing list openwebbeans-commits@incubator.apache.org Received: (qmail 81675 invoked by uid 99); 27 Jan 2009 21:48:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jan 2009 13:48:56 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jan 2009 21:48:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CC84323889B7; Tue, 27 Jan 2009 21:48:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r738257 - in /incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/ container/ context/ context/type/ decorator/ event/ inject/ intercept/ intercept/webbeans/ util/ Date: Tue, 27 Jan 2009 21:48:30 -0000 To: openwebbeans-commits@incubator.apache.org From: gerdogdu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090127214830.CC84323889B7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gerdogdu Date: Tue Jan 27 21:48:29 2009 New Revision: 738257 URL: http://svn.apache.org/viewvc?rev=738257&view=rev Log: Reflect Bean#getBindings and Context API. Removed: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContextReference.java Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java Tue Jan 27 21:48:29 2009 @@ -30,6 +30,7 @@ import org.apache.webbeans.container.ManagerImpl; import org.apache.webbeans.context.DependentContext; +import org.apache.webbeans.context.creational.CreationalContextImpl; import org.apache.webbeans.deployment.DeploymentTypeManager; import org.apache.webbeans.exception.WebBeansException; import org.apache.webbeans.intercept.InterceptorData; @@ -333,7 +334,7 @@ * @see javax.webbeans.manager.Bean#getBindingTypes() */ @Override - public Set getBindingTypes() + public Set getBindings() { return this.implBindingTypes; } @@ -384,12 +385,13 @@ * @param dependentComponent dependent web beans component * @return the dependent component instance */ + @SuppressWarnings("unchecked") public Object getDependent(Component dependentComponent) { Object object = null; DependentContext context = (DependentContext) getManager().getContext(Dependent.class); - object = context.get(dependentComponent, true); + object = context.get(dependentComponent,new CreationalContextImpl()); this.dependentObjects.put(object, dependentComponent); Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java Tue Jan 27 21:48:29 2009 @@ -46,7 +46,7 @@ @Override protected T createInstance(CreationalContext creationalContext) { - Set setBindingTypes = getBindingTypes(); + Set setBindingTypes = getBindings(); Annotation[] bindingTypes = new Annotation[setBindingTypes.size()]; bindingTypes = setBindingTypes.toArray(bindingTypes); Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Tue Jan 27 21:48:29 2009 @@ -253,7 +253,7 @@ while (it.hasNext()) { Bean component = it.next(); - Set bTypes = component.getBindingTypes(); + Set bTypes = component.getBindings(); int i = 0; for (Annotation annot : annotations) Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java Tue Jan 27 21:48:29 2009 @@ -49,6 +49,7 @@ import org.apache.webbeans.config.WebBeansFinder; import org.apache.webbeans.context.ContextFactory; import org.apache.webbeans.context.DependentContext; +import org.apache.webbeans.context.creational.CreationalContextImpl; import org.apache.webbeans.decorator.DecoratorComparator; import org.apache.webbeans.decorator.WebBeansDecorator; import org.apache.webbeans.decorator.WebBeansDecoratorConfig; @@ -317,7 +318,7 @@ else { context = getContext(bean.getScopeType()); - instance = context.get(bean, true); + instance = context.get(bean, new CreationalContextImpl()); } } Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Tue Jan 27 21:48:29 2009 @@ -89,49 +89,57 @@ } } - - public T get(Contextual component, boolean create) + + @SuppressWarnings("unchecked") + public T get(Contextual component) { - return get(component, create, null); + return (T) componentInstanceMap.get(component); } - public T get(Contextual component, boolean create,CreationalContext creationalContext) + public T get(Contextual component, CreationalContext creationalContext) { if (!active) { throw new ContextNotActiveException("WebBeans context with scope type annotation @" + getScopeType().getName() + " is not active with respect to the current thread"); } - return getInstance(component, create, creationalContext); + return getInstance(component, creationalContext); } @SuppressWarnings("unchecked") - protected T getInstance(Contextual component, boolean create,CreationalContext creationalContext) + protected T getInstance(Contextual component, CreationalContext creationalContext) { - Object instance = null; + T instance = (T)componentInstanceMap.get(component); - if ((instance = componentInstanceMap.get(component)) != null) + + if (instance != null) { - return (T) instance; + return instance; } + else { - if (create) + if(creationalContext == null) + { + return null; + } + + else { instance = component.create(creationalContext); + if (instance != null) { componentInstanceMap.put(component, instance); } - - return (T) instance; - } + + } } - return null; + return instance; } - public void remove(Bean component) + public void remove(Contextual component) { removeInstance(component); } @@ -171,7 +179,7 @@ } } - protected void removeInstance(Bean component) + protected void removeInstance(Contextual component) { if (componentInstanceMap.get(component) != null) { Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java Tue Jan 27 21:48:29 2009 @@ -13,13 +13,10 @@ */ package org.apache.webbeans.context; -import javax.context.ContextNotActiveException; import javax.context.Contextual; import javax.context.CreationalContext; import javax.context.Dependent; -import javax.inject.manager.Bean; -import org.apache.webbeans.component.AbstractComponent; import org.apache.webbeans.context.type.ContextTypes; /** @@ -36,58 +33,48 @@ */ public class DependentContext extends AbstractContext { - //X TODO owner never gets set currently?!? - private AbstractComponent owner; - public DependentContext() { super(ContextTypes.DEPENDENT); } + + @Override - protected T getInstance(Contextual component, boolean create,CreationalContext creationalContext) + protected T getInstance(Contextual component,CreationalContext creationalContext) { - if (isActive()) + T object = null; + + if(creationalContext == null) { - if (create) - { - T object = component.create(creationalContext); - - return object; - } + return null; } - else { - throw new ContextNotActiveException("Dependent context with WebBeans component class : " + - (owner != null ? owner.getReturnType() : "null") + - " is not active"); + object = component.create(creationalContext); } + - return null; + return object; } - @Override - protected void removeInstance(Bean component) - { - // no-op - } - /* - * (non-Javadoc) - * @see org.apache.webbeans.context.AbstractContext#destroy() - */ @Override - public void destroy() + public void setComponentInstanceMap() { } + + + /* (non-Javadoc) + * @see org.apache.webbeans.context.AbstractContext#get(javax.context.Contextual) + */ @Override - public void setComponentInstanceMap() + public T get(Contextual component) { - + return null; } } \ No newline at end of file Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java Tue Jan 27 21:48:29 2009 @@ -13,7 +13,7 @@ */ package org.apache.webbeans.context; -import javax.inject.manager.Bean; +import javax.context.Contextual; public interface WebBeansContext extends javax.context.Context { @@ -23,5 +23,5 @@ * @param generic type * @param component web beans component */ - public void remove(Bean component); + public void remove(Contextual component); } Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java Tue Jan 27 21:48:29 2009 @@ -13,24 +13,24 @@ */ package org.apache.webbeans.context.type; -import javax.context.Context; /** * Defines the enumaration of the standart context types in the web beans * container. + * *

+ * * Standart context types, *

    - *
  • Request Context
    • - *
  • Session Context
    • - *
  • Application Context
    • - *
  • Conversation Context
    • + *
  • Dependent Context
    • + *
  • Request Context
    • + *
  • Session Context
    • + *
  • Application Context
    • + *
  • Conversation Context
    • *
+ * *

* - * @author Gurkan Erdogdu - * @since 1.0 - * @see Context */ public enum ContextTypes { @@ -72,4 +72,4 @@ return null; } -} +} \ No newline at end of file Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java Tue Jan 27 21:48:29 2009 @@ -83,7 +83,7 @@ { Asserts.assertNotNull("component", "component parameter can not be null"); - Set annSet = component.getBindingTypes(); + Set annSet = component.getBindings(); Annotation[] anns = new Annotation[annSet.size()]; anns = annSet.toArray(anns); Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java Tue Jan 27 21:48:29 2009 @@ -179,7 +179,6 @@ } - @Override public Object create(CreationalContext context) { Object proxy = JavassistProxyFactory.createNewProxyInstance(this); @@ -213,16 +212,15 @@ } } - @Override public void destroy(Object instance) { delegateComponent.destroy(instance); } @Override - public Set getBindingTypes() + public Set getBindings() { - return delegateComponent.getBindingTypes(); + return delegateComponent.getBindings(); } @Override Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java Tue Jan 27 21:48:29 2009 @@ -63,7 +63,7 @@ public static void configureDecarotors(AbstractComponent component, Object instance) { - Set bindingTypes = component.getBindingTypes(); + Set bindingTypes = component.getBindings(); Annotation[] anns = new Annotation[bindingTypes.size()]; anns = bindingTypes.toArray(anns); Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java Tue Jan 27 21:48:29 2009 @@ -32,6 +32,7 @@ import org.apache.webbeans.container.InjectionResolver; import org.apache.webbeans.container.ManagerImpl; import org.apache.webbeans.context.DependentContext; +import org.apache.webbeans.context.creational.CreationalContextImpl; import org.apache.webbeans.util.AnnotationUtil; public class BeanObserverImpl implements Observer @@ -82,11 +83,11 @@ Context context = manager.getContext(baseComponent.getScopeType()); if (ifExist) { - object = context.get(baseComponent, false); + object = context.get(baseComponent); } else { - object = context.get(baseComponent, true); + object = context.get((AbstractComponent)baseComponent, new CreationalContextImpl()); } if (object != null) Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java Tue Jan 27 21:48:29 2009 @@ -29,6 +29,7 @@ import org.apache.webbeans.container.ResolutionUtil; import org.apache.webbeans.context.DependentContext; import org.apache.webbeans.context.WebBeansContext; +import org.apache.webbeans.context.creational.CreationalContextImpl; import org.apache.webbeans.event.EventImpl; import org.apache.webbeans.exception.WebBeansConfigurationException; import org.apache.webbeans.util.ClassUtil; @@ -166,13 +167,13 @@ return object; } - private Object injectForComponent(AbstractComponent component) + private Object injectForComponent(AbstractComponent component) { WebBeansContext context = null; Object object = null; context = (WebBeansContext) ManagerImpl.getManager().getContext(component.getScopeType()); - object = context.get(component, true); + object = context.get(component, new CreationalContextImpl()); return object; Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java Tue Jan 27 21:48:29 2009 @@ -25,6 +25,7 @@ import org.apache.webbeans.component.AbstractComponent; import org.apache.webbeans.container.ManagerImpl; +import org.apache.webbeans.context.creational.CreationalContextImpl; import org.apache.webbeans.exception.WebBeansException; import org.apache.webbeans.logger.WebBeansLogger; import org.apache.webbeans.util.AnnotationUtil; @@ -51,7 +52,7 @@ public Object invoke(Object instance, Method method, Method proceed, Object[] arguments) throws Throwable { Context webbeansContext = ManagerImpl.getManager().getContext(component.getScopeType()); - Object webbeansInstance = webbeansContext.get(this.component, true); + Object webbeansInstance = webbeansContext.get(this.component, new CreationalContextImpl()); if (!ClassUtil.isObjectMethod(method.getName()) && InterceptorUtil.isWebBeansBusinessMethod(method)) { Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java Tue Jan 27 21:48:29 2009 @@ -243,7 +243,6 @@ return method; } - @Override public Object create(CreationalContext creationalContext) { Object proxy = JavassistProxyFactory.createNewProxyInstance(this); @@ -275,16 +274,15 @@ } - @Override public void destroy(Object instance) { delegateComponent.destroy(instance); } @Override - public Set getBindingTypes() + public Set getBindings() { - return delegateComponent.getBindingTypes(); + return delegateComponent.getBindings(); } @Override Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=738257&r1=738256&r2=738257&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Tue Jan 27 21:48:29 2009 @@ -1056,7 +1056,7 @@ { throw new InconsistentSpecializationException("@Specializes exception. Class : " + clazz.getName() + " must have higher deployment type precedence from the class : " + superClass.getName()); } - parent.getBindingTypes().addAll(child.getBindingTypes()); + parent.getBindings().addAll(child.getBindings()); } else {