Author: pete.muir(a)jboss.org Date: 2009-10-04 11:43:27 -0400 (Sun, 04 Oct 2009) New Revision: 3840 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBConstructorImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBMethodImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java Log: Fix bugs Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBConstructorImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBConstructorImpl.java 2009-10-04 15:42:44 UTC (rev 3839) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBConstructorImpl.java 2009-10-04 15:43:27 UTC (rev 3840) @@ -118,7 +118,7 @@ for (int i = 0; i < constructor.getParameterTypes().length; i++) { - if (constructor.getParameterAnnotations()[i].length > 0) + if (constructor.getParameterAnnotations()[i].length > 0 || annotatedTypeParameters.containsKey(i)) { Class<?> clazz = constructor.getParameterTypes()[i]; Type type = constructor.getGenericParameterTypes()[i]; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBMethodImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBMethodImpl.java 2009-10-04 15:42:44 UTC (rev 3839) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBMethodImpl.java 2009-10-04 15:43:27 UTC (rev 3840) @@ -124,7 +124,7 @@ for (int i = 0; i < method.getParameterTypes().length; i++) { - if (method.getParameterAnnotations()[i].length > 0) + if (method.getParameterAnnotations()[i].length > 0 || annotatedTypeParameters.containsKey(i)) { Class<? extends Object> clazz = method.getParameterTypes()[i]; Type type = method.getGenericParameterTypes()[i]; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java 2009-10-04 15:42:44 UTC (rev 3839) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java 2009-10-04 15:43:27 UTC (rev 3840) @@ -76,7 +76,7 @@ this.declaringMember = declaringMember; this._package = declaringMember.getPackage(); this.position = position; - this.toString = new StringBuilder().append("parameter ").append(position + 1).append(" of ").append(declaringMember.toString()).toString(); + this.toString = new StringBuilder().append("parameter ").append(position).append(" of ").append(declaringMember.toString()).toString(); } /**