Author: dazarov Date: 2010-02-05 11:15:26 -0500 (Fri, 05 Feb 2010) New Revision: 20151 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/InjectedPointListHyperlink.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-02-05 16:04:01 UTC (rev 20150) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2010-02-05 16:15:26 UTC (rev 20151) @@ -86,7 +86,7 @@ } /** - * Sorts CDI beans. Sets for alternative beans higher position and for nonalternative beans lower position. + * Sorts CDI beans which may be injected. Sets for alternative beans higher position and for nonalternative beans lower position. * * @param beans * @param element @@ -96,6 +96,9 @@ Set<IBean> nonAlternativeBeans = new HashSet<IBean>(); for(IBean bean : beans){ + if(bean == null || bean instanceof IDecorator || bean instanceof IInterceptor) + continue; + if(bean.isAlternative()) alternativeBeans.add(bean); else Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java 2010-02-05 16:04:01 UTC (rev 20150) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java 2010-02-05 16:15:26 UTC (rev 20151) @@ -84,8 +84,7 @@ int index=0; for(IBean bean : resultBeanList){ - if(bean != null) - hyperlinks[index++] = new InjectedPointHyperlink(region, bean, getDocument()); + hyperlinks[index++] = new InjectedPointHyperlink(region, bean, getDocument()); } if(hyperlinks.length == 0){