Author: akazakov
Date: 2012-07-11 14:46:59 -0400 (Wed, 11 Jul 2012)
New Revision: 42513
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFELCompletionEngine.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java
Log:
https://issues.jboss.org/browse/JBIDE-12317 EL Validation warnings for functions
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFELCompletionEngine.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFELCompletionEngine.java 2012-07-11
18:20:55 UTC (rev 42512)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFELCompletionEngine.java 2012-07-11
18:46:59 UTC (rev 42513)
@@ -91,7 +91,7 @@
* @param onlyEqualNames
* @return
*/
- public List<IJSFVariable> resolveVariables(IFile file, ELContext context,
IModelNature project, ELInvocationExpression expr, boolean isFinal, boolean
onlyEqualNames, int offset) {
+ private List<IJSFVariable> resolveVariables(IFile file, ELContext context,
IModelNature project, ELInvocationExpression expr, boolean isFinal, boolean
onlyEqualNames, int offset) {
List<IJSFVariable>resolvedVars = new ArrayList<IJSFVariable>();
if (project == null)
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java 2012-07-11
18:20:55 UTC (rev 42512)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java 2012-07-11
18:46:59 UTC (rev 42513)
@@ -58,7 +58,8 @@
* (non-Javadoc)
* @see
org.jboss.tools.jst.web.kb.el.AbstractELCompletionEngine#getMemberInfoByVariable(org.jboss.tools.jst.web.kb.el.AbstractELCompletionEngine.IVariable,
boolean)
*/
- protected TypeInfoCollector.MemberInfo getMemberInfoByVariable(IJSFVariable var, boolean
onlyEqualNames, int offset) {
+ @Override
+ protected TypeInfoCollector.MemberInfo getMemberInfoByVariable(IJSFVariable var,
ELContext context, boolean onlyEqualNames, int offset) {
// Need to create artificial member info based on the Source Member type, but having
only method named after the func's name
if (!(var instanceof Variable))
return null;
@@ -92,7 +93,7 @@
return resolveVariablesInternal(file, expr, isFinal, onlyEqualNames, offset);
}
- public List<IJSFVariable> resolveVariablesInternal(IFile file,
ELInvocationExpression expr, boolean isFinal, boolean onlyEqualNames, int offset) {
+ private List<IJSFVariable> resolveVariablesInternal(IFile file,
ELInvocationExpression expr, boolean isFinal, boolean onlyEqualNames, int offset) {
ELContext context = PageContextFactory.createPageContext(file);
if (!(context instanceof XmlContextImpl)) {