Author: akazakov Date: 2009-12-07 11:23:34 -0500 (Mon, 07 Dec 2009) New Revision: 19080 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java Log: https://jira.jboss.org/jira/browse/JBIDE-5383 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2009-12-07 14:43:47 UTC (rev 19079) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2009-12-07 16:23:34 UTC (rev 19080) @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Set; @@ -30,7 +29,9 @@ import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IBeanManager; +import org.jboss.tools.cdi.core.IBeanMember; import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IStereotypeDeclaration; import org.jboss.tools.cdi.core.ITypeDeclaration; @@ -38,6 +39,7 @@ import org.jboss.tools.common.el.core.model.ELInvocationExpression; import org.jboss.tools.common.el.core.parser.ELParserFactory; import org.jboss.tools.common.el.core.parser.ELParserUtil; +import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo; import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.jst.web.kb.el.AbstractELCompletionEngine; @@ -54,7 +56,7 @@ */ @Override public Image getELProposalImage() { - // TODO Auto-generated method stub + // TODO return null; } @@ -71,9 +73,15 @@ * @see org.jboss.tools.jst.web.kb.el.AbstractELCompletionEngine#getMemberInfoByVariable(org.jboss.tools.common.el.core.resolver.IVariable, boolean) */ @Override - protected MemberInfo getMemberInfoByVariable(IBean var, boolean onlyEqualNames) { - // TODO - return null; + protected MemberInfo getMemberInfoByVariable(IBean bean, boolean onlyEqualNames) { + IMember member = null; + if(bean instanceof IClassBean) { + member = bean.getBeanClass(); + } else if(bean instanceof IBeanMember) { + IBeanMember beanMember = (IBeanMember)bean; + member = beanMember.getSourceMember(); + } + return TypeInfoCollector.createMemberInfo(member); } /* @@ -92,10 +100,8 @@ String varName = expr.toString(); if (varName != null) { - IBeanManager manager = null; - // TODO -// Set<IBean> resolvedBeans = manager.getBeans(varName, true); - Set<IBean> resolvedBeans = new HashSet<IBean>(); + IBeanManager manager = CDICorePlugin.getCDI(project, false).getDelegate(); + Set<IBean> resolvedBeans = manager.getBeans(varName, true); if(onlyEqualNames) { beans.addAll(resolvedBeans); } else {