Author: scabanovich
Date: 2012-04-04 18:32:27 -0400 (Wed, 04 Apr 2012)
New Revision: 40042
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
Log:
JBIDE-11449
https://issues.jboss.org/browse/JBIDE-11449
Specialized Bean can set bean name if it is not inherited.
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2012-04-04
22:16:37 UTC (rev 40041)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2012-04-04
22:32:27 UTC (rev 40042)
@@ -371,7 +371,10 @@
public String getName() {
ClassBean specialized = getSpecializedBean();
if(specialized != null) {
- return specialized.getName();
+ String name = specialized.getName();
+ if(name != null) {
+ return name;
+ }
}
AnnotationDeclaration named = findNamedAnnotation();
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2012-04-04
22:16:37 UTC (rev 40041)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2012-04-04
22:32:27 UTC (rev 40042)
@@ -116,7 +116,10 @@
public String getName() {
ProducerMethod specialized = getSpecializedBean();
if(specialized != null) {
- return specialized.getName();
+ String name = specialized.getName();
+ if(name != null) {
+ return name;
+ }
}
AnnotationDeclaration named = findNamedAnnotation();