Author: gavin.king(a)jboss.com Date: 2009-01-12 11:47:16 -0500 (Mon, 12 Jan 2009) New Revision: 899 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java Log: getBindingTypes() -> getBindings() Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-12 16:43:36 UTC (rev 898) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-12 16:47:16 UTC (rev 899) @@ -159,7 +159,7 @@ this.bindingTypes.addAll(getAnnotatedItem().getMetaAnnotations(BindingType.class)); if (specialization) { - this.bindingTypes.addAll(getSpecializedType().getBindingTypes()); + this.bindingTypes.addAll(getSpecializedType().getBindings()); log.trace("Using binding types " + bindingTypes + " specified by annotations and specialized supertype"); } else if (bindingTypes.size() == 0) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-01-12 16:43:36 UTC (rev 898) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-01-12 16:47:16 UTC (rev 899) @@ -279,7 +279,7 @@ buffer.append("simple producer bean '" + getName() + "'"); } buffer.append(" [" + getType().getName() + "]\n"); - buffer.append(" API types " + getTypes() + ", binding types " + getBindingTypes() + "\n"); + buffer.append(" API types " + getTypes() + ", binding types " + getBindings() + "\n"); return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-12 16:43:36 UTC (rev 898) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-12 16:47:16 UTC (rev 899) @@ -413,7 +413,7 @@ buffer.append(" enterprise bean '" + getName() + "'"); } buffer.append(" [" + getType().getName() + "]\n"); - buffer.append(" API types " + getTypes() + ", binding types " + getBindingTypes() + "\n"); + buffer.append(" API types " + getTypes() + ", binding types " + getBindings() + "\n"); return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2009-01-12 16:43:36 UTC (rev 898) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2009-01-12 16:47:16 UTC (rev 899) @@ -172,7 +172,7 @@ buffer.append(" enterprise bean '" + getName() + "'"); } buffer.append(" [" + getType().getName() + "]\n"); - buffer.append(" API types " + getTypes() + ", binding types " + getBindingTypes() + "\n"); + buffer.append(" API types " + getTypes() + ", binding types " + getBindings() + "\n"); return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2009-01-12 16:43:36 UTC (rev 898) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2009-01-12 16:47:16 UTC (rev 899) @@ -125,7 +125,7 @@ buffer.append("simple producer field bean '" + getName() + "'"); } buffer.append(" [" + getType().getName() + "]\n"); - buffer.append(" API types " + getTypes() + ", binding types " + getBindingTypes() + "\n"); + buffer.append(" API types " + getTypes() + ", binding types " + getBindings() + "\n"); return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-12 16:43:36 UTC (rev 898) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-12 16:47:16 UTC (rev 899) @@ -138,7 +138,7 @@ */ protected void initDisposalMethod() { - Set<AnnotatedMethod<Object>> disposalMethods = manager.resolveDisposalMethods(getType(), getBindingTypes().toArray(new Annotation[0])); + Set<AnnotatedMethod<Object>> disposalMethods = manager.resolveDisposalMethods(getType(), getBindings().toArray(new Annotation[0])); if (disposalMethods.size() == 1) { this.disposalMethod = disposalMethods.iterator().next(); @@ -201,7 +201,7 @@ buffer.append("simple producer method bean '" + getName() + "'"); } buffer.append(" [" + getType().getName() + "]\n"); - buffer.append(" API types " + getTypes() + ", binding types " + getBindingTypes() + "\n"); + buffer.append(" API types " + getTypes() + ", binding types " + getBindings() + "\n"); return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-12 16:43:36 UTC (rev 898) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-12 16:47:16 UTC (rev 899) @@ -489,7 +489,7 @@ buffer.append("simple bean '" + getName() + "'"); } buffer.append(" [" + getType().getName() + "]\n"); - buffer.append(" API types " + getTypes() + ", binding types " + getBindingTypes() + "\n"); + buffer.append(" API types " + getTypes() + ", binding types " + getBindings() + "\n"); return buffer.toString(); }