Author: scabanovich
Date: 2011-09-20 14:32:17 -0400 (Tue, 20 Sep 2011)
New Revision: 34888
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
Log:
JBIDE-9742
https://issues.jboss.org/browse/JBIDE-9742
Fixed CDIUtil.findInjectionPoint()
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-09-20
18:31:58 UTC (rev 34887)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-09-20
18:32:17 UTC (rev 34888)
@@ -221,11 +221,15 @@
if (((IInjectionPointField) iPoint).getField() != null &&
((IInjectionPointField)
iPoint).getField().getElementName().equals(element.getElementName()))
return iPoint;
}else if(element instanceof ILocalVariable && iPoint instanceof
IInjectionPointParameter){
- if (((IInjectionPointParameter) iPoint).getName().equals(element.getElementName()))
+ IInjectionPointParameter param = (IInjectionPointParameter)iPoint;
+ if (param.getBeanMethod().getMethod().equals(element.getParent())
+ && param.getName().equals(element.getElementName())) {
return iPoint;
+ }
}else if(iPoint instanceof IInjectionPointParameter && position != 0){
- if(iPoint.getStartPosition() <= position &&
(iPoint.getStartPosition()+iPoint.getLength()) >= position)
+ if(iPoint.getStartPosition() <= position &&
(iPoint.getStartPosition()+iPoint.getLength()) >= position) {
return iPoint;
+ }
}
}
}