Author: dazarov
Date: 2011-11-09 15:33:25 -0500 (Wed, 09 Nov 2011)
New Revision: 36254
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
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/CDIUIMessages.properties
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2011-11-09
19:51:30 UTC (rev 36253)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2011-11-09
20:33:25 UTC (rev 36254)
@@ -115,8 +115,8 @@
ADD_QUALIFIERS_TO_BEAN_WIZARD_TITLE=Add/Remove Qualifiers to/from the
''{0}'' bean
ADD_QUALIFIERS_TO_BEAN_WIZARD_AVAILABLE=Available:
-ADD_QUALIFIERS_TO_BEAN_WIZARD_IN_BEAN=In the Bean:
-ADD_QUALIFIERS_TO_BEAN_WIZARD_MESSAGE=Move qualifiers to the right to add them to the
''{0}'' bean
+ADD_QUALIFIERS_TO_BEAN_WIZARD_IN_BEAN=In the Bean and Injection Point:
+ADD_QUALIFIERS_TO_BEAN_WIZARD_MESSAGE=Move qualifiers to the right to add them to the
''{0}'' bean and ''{1}'' injection point
ADD_QUALIFIERS_TO_BEAN_WIZARD_ADD=Add >
ADD_QUALIFIERS_TO_BEAN_WIZARD_ADD_ALL=Add All >>
ADD_QUALIFIERS_TO_BEAN_WIZARD_REMOVE=< Remove
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-09
19:51:30 UTC (rev 36253)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-09
20:33:25 UTC (rev 36254)
@@ -169,7 +169,7 @@
availableTableViewer.setInput(qualifiers);
if(nLabel != null)
nLabel.setText(MessageFormat.format(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_MESSAGE,
- new Object[]{bean.getElementName()}));
+ new Object[]{bean.getElementName(), injectionPoint.getElementName()}));
refresh();
}
@@ -273,7 +273,7 @@
nLabel.setLayoutData(data);
if(bean != null)
nLabel.setText(MessageFormat.format(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_MESSAGE,
- new Object[]{bean.getElementName()}));
+ new Object[]{bean.getElementName(), injectionPoint.getElementName()}));
Label label = new Label(this, SWT.NONE);
label.setText(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_ENTER_QUALIFIER_NAME);