Author: scabanovich Date: 2010-10-14 08:22:38 -0400 (Thu, 14 Oct 2010) New Revision: 25826 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspELCompletionProposalComputer.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspTagCompletionProposalComputer.java Log: JBIDE-7265 https://jira.jboss.org/browse/JBIDE-7265 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2010-10-14 12:20:30 UTC (rev 25825) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2010-10-14 12:22:38 UTC (rev 25826) @@ -15,6 +15,7 @@ import java.util.Map; import org.eclipse.core.resources.IFile; +import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Region; import org.eclipse.jface.text.contentassist.IContextInformation; @@ -35,6 +36,7 @@ import org.jboss.tools.common.el.core.resolver.ELResolution; import org.jboss.tools.common.el.core.resolver.ELResolutionImpl; import org.jboss.tools.common.el.core.resolver.ElVarSearcher; +import org.jboss.tools.common.el.core.resolver.IRelevanceCheck; import org.jboss.tools.common.el.core.resolver.Var; import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jst.web.kb.IPageContext; @@ -250,6 +252,10 @@ public List<TextProposal> getProposals(ELContext context, int offset) { return Collections.emptyList(); } + + public IRelevanceCheck createRelevanceCheck(IJavaElement element) { + return null; + } }; ElVarSearcher varSearcher = new ElVarSearcher(file, fakeEngine); List<Var> vars = varSearcher.findAllVars(file, getOffset()); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspELCompletionProposalComputer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspELCompletionProposalComputer.java 2010-10-14 12:20:30 UTC (rev 25825) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspELCompletionProposalComputer.java 2010-10-14 12:22:38 UTC (rev 25826) @@ -15,6 +15,7 @@ import java.util.Map; import org.eclipse.core.resources.IFile; +import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Region; import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext; @@ -28,6 +29,7 @@ import org.jboss.tools.common.el.core.resolver.ELResolution; import org.jboss.tools.common.el.core.resolver.ELResolutionImpl; import org.jboss.tools.common.el.core.resolver.ElVarSearcher; +import org.jboss.tools.common.el.core.resolver.IRelevanceCheck; import org.jboss.tools.common.el.core.resolver.Var; import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jst.web.kb.IPageContext; @@ -120,6 +122,10 @@ public List<TextProposal> getProposals(ELContext context, int offset) { return Collections.emptyList(); } + + public IRelevanceCheck createRelevanceCheck(IJavaElement element) { + return null; + } }; ElVarSearcher varSearcher = new ElVarSearcher(file, fakeEngine); List<Var> vars = varSearcher.findAllVars(file, getOffset()); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspTagCompletionProposalComputer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspTagCompletionProposalComputer.java 2010-10-14 12:20:30 UTC (rev 25825) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspTagCompletionProposalComputer.java 2010-10-14 12:22:38 UTC (rev 25826) @@ -15,6 +15,7 @@ import java.util.Map; import org.eclipse.core.resources.IFile; +import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Region; import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext; @@ -28,6 +29,7 @@ import org.jboss.tools.common.el.core.resolver.ELResolution; import org.jboss.tools.common.el.core.resolver.ELResolutionImpl; import org.jboss.tools.common.el.core.resolver.ElVarSearcher; +import org.jboss.tools.common.el.core.resolver.IRelevanceCheck; import org.jboss.tools.common.el.core.resolver.Var; import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jst.web.kb.IPageContext; @@ -144,6 +146,10 @@ public List<TextProposal> getProposals(ELContext context, int offset) { return Collections.emptyList(); } + + public IRelevanceCheck createRelevanceCheck(IJavaElement element) { + return null; + } }; ElVarSearcher varSearcher = new ElVarSearcher(file, fakeEngine); List<Var> vars = varSearcher.findAllVars(file, getOffset());