[jbosstools-commits] JBoss Tools SVN: r33589 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directory.

Author: scabanovich Date: 2011-08-04 12:30:57 -0400 (Thu, 04 Aug 2011) New Revision: 33589 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java Log: JBIDE-9452 https://issues.jboss.org/browse/JBIDE-9452 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-08-04 15:45:02 UTC (rev 33588) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-08-04 16:30:57 UTC (rev 33589) @@ -71,4 +71,11 @@ * @return the @Inject annotation declaration. */ IAnnotationDeclaration getInjectAnnotation(); + + /** + * Returns name declared by @Named. + * + * @return name declared by @Named + */ + public String getName(); } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-08-04 15:45:02 UTC (rev 33588) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-08-04 16:30:57 UTC (rev 33589) @@ -42,6 +42,17 @@ return (BeanMemberDefinition)definition; } + public String getName() { + AnnotationDeclaration d = getDefinition().getNamedAnnotation(); + if(d != null) { + Object n = d.getMemberValue(null); + if(n != null) { + return n.toString(); + } + } + return null; + } + protected void setMember(IJavaElement member) { try { String returnType = null; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-08-04 15:45:02 UTC (rev 33588) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-08-04 16:30:57 UTC (rev 33589) @@ -32,6 +32,18 @@ return super.getType(); } + public String getName() { + AnnotationDeclaration d = getDefinition().getNamedAnnotation(); + if(d != null) { + Object n = d.getMemberValue(null); + if(n != null && n.toString().length() > 0) { + return n.toString(); + } + return field.getElementName(); + } + return null; + } + public IParametedType getJavaMemberType() { return super.getType(); }