[jbosstools-commits] JBoss Tools SVN: r36511 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: wizard/xpl and 1 other directory.
Author: dazarov
Date: 2011-11-21 13:49:43 -0500 (Mon, 21 Nov 2011)
New Revision: 36511
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
Log:
Quickfix and Wizard for fixing ambigious injection warning is confusing
https://issues.jboss.org/browse/JBIDE-9940
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-11-21
18:05:44 UTC (rev 36510)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-11-21
18:49:43 UTC (rev 36511)
@@ -822,13 +822,18 @@
if(declaration == null)
return "";
- return findQualifierValue(declaration);
+ return findQualifierValue(bean, declaration);
}
- public static String findQualifierValue(IQualifierDeclaration declaration){
+ public static String findQualifierValue(IBean bean, IQualifierDeclaration declaration){
Object value = declaration.getMemberValue(null);
- return value == null ? "" : value.toString();
+ String result = value == null ? "" : value.toString();
+
+ if("".equals(result) &&
declaration.getQualifier().getSourceType().getFullyQualifiedName().equals(CDIConstants.NAMED_QUALIFIER_TYPE_NAME))
+ result = getELName(bean);
+
+ return result;
}
public static IQualifierDeclaration findQualifierDeclaration(IBean bean, IQualifier
qualifier){
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-21
18:05:44 UTC (rev 36510)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-21
18:49:43 UTC (rev 36511)
@@ -139,7 +139,7 @@
for(IQualifier q : bean.getQualifiers()){
IQualifierDeclaration declaration =
MarkerResolutionUtils.findQualifierDeclaration(bean, q);
if(declaration != null){
- String value = MarkerResolutionUtils.findQualifierValue(declaration);
+ String value = MarkerResolutionUtils.findQualifierValue(bean, declaration);
ValuedQualifier vq = new ValuedQualifier(q, value);
deployed.add(vq);
}else{