Author: dazarov Date: 2010-01-28 05:58:44 -0500 (Thu, 28 Jan 2010) New Revision: 19981 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java Log: https://jira.jboss.org/jira/browse/JBIDE-3125 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 2010-01-28 10:56:25 UTC (rev 19980) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2010-01-28 10:58:44 UTC (rev 19981) @@ -29,11 +29,6 @@ */ public class CDIUtil { /** - * CDI Inject annotation's name - */ - public final static String INJECT_ANNOTATION_NAME = "Inject"; //$NON-NLS-1$ - - /** * Adds CDI and KB builders to the project. * * @param project Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2010-01-28 10:56:25 UTC (rev 19980) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2010-01-28 10:58:44 UTC (rev 19981) @@ -32,6 +32,7 @@ import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector; import org.eclipse.jface.text.hyperlink.IHyperlink; import org.eclipse.ui.texteditor.ITextEditor; +import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.CDIUtil; @@ -98,7 +99,7 @@ for (IJavaElement element : elements) { if(element instanceof IType){ - if(CDIUtil.INJECT_ANNOTATION_NAME.equals(element.getElementName())){ + if(CDIConstants.INJECT_ANNOTATION_TYPE_NAME.equals(((IType) element).getFullyQualifiedName())){ ICompilationUnit cUnit = (ICompilationUnit)input; element = cUnit.getElementAt(wordRegion.getOffset()); if(element == null) @@ -109,7 +110,7 @@ if (element instanceof IAnnotatable) { IAnnotatable annotatable = (IAnnotatable)element; - IAnnotation annotation = annotatable.getAnnotation(CDIUtil.INJECT_ANNOTATION_NAME); + IAnnotation annotation = annotatable.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME); if (annotation == null) continue; IInjectionPoint injectionPoint = CDIUtil.findInjectionPoint(beans, element); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java 2010-01-28 10:56:25 UTC (rev 19980) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java 2010-01-28 10:58:44 UTC (rev 19981) @@ -31,6 +31,7 @@ import org.eclipse.jdt.ui.search.ISearchRequestor; import org.eclipse.jdt.ui.search.QuerySpecification; import org.eclipse.search.ui.text.Match; +import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.CDIUtil; @@ -76,7 +77,7 @@ if (element instanceof IAnnotatable) { IAnnotatable annotatable = (IAnnotatable)element; - IAnnotation annotation = annotatable.getAnnotation(CDIUtil.INJECT_ANNOTATION_NAME); + IAnnotation annotation = annotatable.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME); if (annotation == null) return; IInjectionPoint injectionPoint = CDIUtil.findInjectionPoint(beans, element);