Author: scabanovich Date: 2009-06-22 13:10:32 -0400 (Mon, 22 Jun 2009) New Revision: 16122 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java Log: https://jira.jboss.org/jira/browse/JBIDE-2808 AbstractELCompletionEngine Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2009-06-22 17:08:10 UTC (rev 16121) +++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2009-06-22 17:10:32 UTC (rev 16122) @@ -34,7 +34,7 @@ org.eclipse.jst.jsf.facesconfig, org.eclipse.jst.j2ee.core, org.eclipse.jst.common.frameworks, - org.jboss.tools.jst.web.kb + org.jboss.tools.jst.web.kb;visibility:=reexport Bundle-Version: 2.0.0 Export-Package: org.jboss.tools.seam.core, Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java 2009-06-22 17:08:10 UTC (rev 16121) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java 2009-06-22 17:10:32 UTC (rev 16122) @@ -10,11 +10,13 @@ ******************************************************************************/ package org.jboss.tools.seam.core; +import org.jboss.tools.jst.web.kb.AbstractELCompletionEngine.IVariable; + /** * Represents Seam Context Variable. * @author Alexey Kazakov */ -public interface ISeamContextVariable extends ISeamDeclaration { +public interface ISeamContextVariable extends ISeamDeclaration, IVariable { /** * Sets name Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2009-06-22 17:08:10 UTC (rev 16121) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2009-06-22 17:10:32 UTC (rev 16122) @@ -33,11 +33,9 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextViewer; import org.eclipse.swt.graphics.Image; -import org.jboss.tools.common.el.core.model.ELArgumentInvocation; import org.jboss.tools.common.el.core.model.ELExpression; import org.jboss.tools.common.el.core.model.ELInstance; import org.jboss.tools.common.el.core.model.ELInvocationExpression; -import org.jboss.tools.common.el.core.model.ELMethodInvocation; import org.jboss.tools.common.el.core.model.ELModel; import org.jboss.tools.common.el.core.model.ELObjectType; import org.jboss.tools.common.el.core.model.ELPropertyInvocation; @@ -45,9 +43,7 @@ import org.jboss.tools.common.el.core.parser.ELParser; 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.parser.LexicalToken; import org.jboss.tools.common.el.core.resolver.ELCompletionEngine; -import org.jboss.tools.common.el.core.resolver.ELContext; import org.jboss.tools.common.el.core.resolver.ELOperandResolveStatus; import org.jboss.tools.common.el.core.resolver.ELResolver; import org.jboss.tools.common.el.core.resolver.ElVarSearcher; @@ -58,7 +54,7 @@ import org.jboss.tools.common.model.project.ext.event.Change; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.text.TextProposal; -import org.jboss.tools.jst.web.kb.IPageContext; +import org.jboss.tools.jst.web.kb.AbstractELCompletionEngine; import org.jboss.tools.seam.core.IBijectedAttribute; import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.core.ISeamContextShortVariable; @@ -78,7 +74,7 @@ * * @author Jeremy */ -public final class SeamELCompletionEngine implements ELCompletionEngine, ELResolver { +public final class SeamELCompletionEngine extends AbstractELCompletionEngine<ISeamContextVariable> implements ELCompletionEngine, ELResolver { private static final Image SEAM_EL_PROPOSAL_IMAGE = SeamCorePlugin.getDefault().getImage(SeamCorePlugin.CA_SEAM_EL_IMAGE_PATH); @@ -94,6 +90,10 @@ } + public Image getELProposalImage() { + return SEAM_EL_PROPOSAL_IMAGE; + } + /* * (non-Javadoc) * @see org.jboss.tools.common.el.core.resolver.ELCompletionEngine#getParserFactory() @@ -102,215 +102,15 @@ return factory; } - /* - * (non-Javadoc) - * @see org.jboss.tools.common.el.core.resolver.ELResolver#getCompletions(java.lang.String, boolean, int, org.jboss.tools.common.el.core.resolver.ELContext) - */ - public List<TextProposal> getCompletions(String elString, boolean returnEqualedVariablesOnly, int position, ELContext context) { - IDocument document = null; - if(context instanceof IPageContext) { - IPageContext pageContext = (IPageContext)context; - document = pageContext.getDocument(); - } - List<Var> vars = new ArrayList<Var>(); - Var[] array = context.getVars(); - for (int i = 0; i < array.length; i++) { - vars.add(array[i]); - } - List<TextProposal> proposals = null; - try { - proposals = getCompletions(context.getResource(), document, elString.subSequence(0, elString.length()), position, returnEqualedVariablesOnly, vars); - } catch (StringIndexOutOfBoundsException e) { - SeamCorePlugin.getPluginLog().logError(e); - } catch (BadLocationException e) { - SeamCorePlugin.getPluginLog().logError(e); - } - return proposals; + protected void log(Exception e) { + SeamCorePlugin.getPluginLog().logError(e); } - /* - * (non-Javadoc) - * @see org.jboss.tools.common.el.core.resolver.ELResolver#resolveELOperand(org.jboss.tools.common.el.core.model.ELExpression, org.jboss.tools.common.el.core.resolver.ELContext, boolean) - */ - public ELOperandResolveStatus resolveELOperand(ELExpression operand, ELContext context, boolean returnEqualedVariablesOnly) { - List<Var> vars = new ArrayList<Var>(); - Var[] array = context.getVars(); - for (int i = 0; i < array.length; i++) { - vars.add(array[i]); - } - ELOperandResolveStatus status = null; - try { - status = resolveELOperand(context.getResource(), operand, returnEqualedVariablesOnly, vars, new ElVarSearcher(context.getResource(), this)); - } catch (StringIndexOutOfBoundsException e) { - SeamCorePlugin.getPluginLog().logError(e); - } catch (BadLocationException e) { - SeamCorePlugin.getPluginLog().logError(e); - } - return status; + protected ELOperandResolveStatus newELOperandResolveStatus(ELInvocationExpression tokens) { + return new SeamELOperandResolveStatus(tokens); } /** - * Create the list of suggestions. - * @param seamProject Seam project - * @param file File - * @param documentContent - * @param prefix the prefix to search for - * @param position Offset of the prefix - * @param vars - 'var' attributes which can be used in this EL. Can be null. - * @param returnEqualedVariablesOnly 'false' if we get proposals for mask - * for example: - * we have 'variableName.variableProperty', 'variableName.variableProperty1', 'variableName.variableProperty2' - * prefix is 'variableName.variableProperty' - * Result is {'variableProperty'} - * if 'false' then returns ends of variables that starts with prefix. It's useful for CA. - * for example: - * we have 'variableName.variableProperty', 'variableName.variableProperty1', 'variableName.variableProperty2' - * prefix is 'variableName.variableProperty' - * Result is {'1','2'} - * @return the list of all possible suggestions - * @throws BadLocationException if accessing the current document fails - * @throws StringIndexOutOfBoundsException - */ - public List<TextProposal> getCompletions(IFile file, IDocument document, CharSequence prefix, - int position, boolean returnEqualedVariablesOnly, List<Var> vars) throws BadLocationException, StringIndexOutOfBoundsException { - List<TextProposal> completions = new ArrayList<TextProposal>(); - - ELOperandResolveStatus status = resolveELOperand(file, parseOperand("" + prefix), returnEqualedVariablesOnly, vars, new ElVarSearcher(file, this)); - if (status.isOK()) { - completions.addAll(status.getProposals()); - } - - return completions; - } - private static final String collectionAdditionForCollectionDataModel = ".iterator().next()"; - private static final String collectionAdditionForMapDataModel = ".entrySet().iterator().next()"; - - private List<String> getVarNameProposals(List <Var> vars, String prefix) { - List<String> proposals = new ArrayList<String>(); - for (Var var : vars) { - if(var.getName().startsWith(prefix)) { - String proposal = var.getName().substring(prefix.length()); - proposals.add(proposal); - } - } - return proposals; - } - - public SeamELOperandResolveStatus resolveELOperand(IFile file, ELExpression operand, - boolean returnEqualedVariablesOnly, List<Var> vars, ElVarSearcher varSearcher) throws BadLocationException, StringIndexOutOfBoundsException { - if(operand == null) { - //TODO - return new SeamELOperandResolveStatus(null); - } - String oldEl = operand.getText(); - Var var = varSearcher.findVarForEl(oldEl, vars, true); - String suffix = ""; - String newEl = oldEl; - TypeInfoCollector.MemberInfo member = null; - boolean isArray = false; - if(var!=null) { - member = resolveSeamEL(file, var.getElToken(), true); - if(member!=null) { - if(!member.getType().isArray()) { - IType type = member.getMemberType(); - if(type!=null) { - try { - if(TypeInfoCollector.isInstanceofType(type, "java.util.Map")) { - suffix = collectionAdditionForMapDataModel; - } else if(TypeInfoCollector.isInstanceofType(type, "java.util.Collection")) { - suffix = collectionAdditionForCollectionDataModel; - } - } catch (JavaModelException e) { - SeamCorePlugin.getPluginLog().logError(e); - } - } - } else { - isArray = true; - } - } - if(var.getElToken() != null) { - newEl = var.getElToken().getText() + suffix + oldEl.substring(var.getName().length()); - } - } - boolean prefixWasChanged = !oldEl.equals(newEl); - if(prefixWasChanged && isArray) { - member.setDataModel(true); - } - ELExpression newOperand = (prefixWasChanged) ? parseOperand(newEl) : operand; - - SeamELOperandResolveStatus status = resolveELOperand(file, newOperand, returnEqualedVariablesOnly, prefixWasChanged); - - if(prefixWasChanged) { - ELInvocationExpression newLastResolvedToken = status.getLastResolvedToken(); - status.setTokens((ELInvocationExpression)operand); - if(newLastResolvedToken != null) { - if(status.getUnresolvedTokens() != null - && status.getUnresolvedTokens().getInvocationStartPosition() - status.getUnresolvedTokens().getStartPosition() < var.getElToken().getLength() + suffix.length()) { - // Last resolved token is token from "var". Set first token of original EL as last resolved one. - status.setLastResolvedToken(null); - } else { - // Last resolved token is token outside "var" prefix. Correct last resolved token. - int oldLastResolvedTokenStart = newLastResolvedToken.getInvocationStartPosition() - var.getElToken().getText().length() - suffix.length() + var.getName().length(); - if(newLastResolvedToken.getLeft() == null) { - //In this case we do not need to take into account difference in length of var and its expression. - oldLastResolvedTokenStart = newLastResolvedToken.getInvocationStartPosition(); - } - ELInvocationExpression l = (ELInvocationExpression)operand; - while(l != null) { - if(l.getInvocationStartPosition() - l.getStartPosition() <= oldLastResolvedTokenStart) { - status.setLastResolvedToken(l); - break; - } - l = l.getLeft(); - } - } - } - } - - if(prefixWasChanged) { - var.resolveValue("#{" + var.getElToken().getText() + suffix + "}"); - } - - if(!returnEqualedVariablesOnly && vars!=null) { - List<String> varNameProposals = getVarNameProposals(vars, operand.toString()); - if (varNameProposals != null) { - for (String varNameProposal : varNameProposals) { - TextProposal proposal = new TextProposal(); - proposal.setReplacementString(varNameProposal); - proposal.setImage(SEAM_EL_PROPOSAL_IMAGE); - status.getProposals().add(proposal); - } - } - } - return status; - } - - public ELExpression parseOperand(String operand) { - if(operand == null) return null; - String el = (operand.indexOf("#{") < 0 && operand.indexOf("${") < 0) ? "#{" + operand + "}" : operand; - ELParser p = factory.createParser(); - ELModel model = p.parse(el); - List<ELInstance> is = model.getInstances(); - if(is.isEmpty()) return null; - return is.get(0).getExpression(); - } - - /** - * Returns MemberInfo for last segment of EL. Null if El is not resolved. - * @param seamProject - * @param file - * @param operand EL without #{} - * @return MemberInfo for last segment of EL. Null if El is not resolved. - * @throws BadLocationException - * @throws StringIndexOutOfBoundsException - */ - public TypeInfoCollector.MemberInfo resolveSeamEL(IFile file, ELExpression operand, boolean varIsUsed) throws BadLocationException, StringIndexOutOfBoundsException { - if(!(operand instanceof ELInvocationExpression)) return null; - ELOperandResolveStatus status = resolveELOperand(file, operand, true, varIsUsed); - return status.getMemberOfResolvedOperand(); - } - - /** * Returns a list of Seam Context Variables that is represented by EL. Null if El is not resolved. * @param project * @param file @@ -366,428 +166,75 @@ return resolvedVariables; } - public SeamELOperandResolveStatus resolveELOperand(IFile file, ELExpression operand, - boolean returnEqualedVariablesOnly, boolean varIsUsed) throws BadLocationException, StringIndexOutOfBoundsException { - if(!(operand instanceof ELInvocationExpression) || file == null) { - return new SeamELOperandResolveStatus(null); - } - - ELInvocationExpression expr = (ELInvocationExpression)operand; - boolean isIncomplete = expr.getType() == ELObjectType.EL_PROPERTY_INVOCATION - && ((ELPropertyInvocation)expr).getName() == null; - boolean isArgument = expr.getType() == ELObjectType.EL_ARGUMENT_INVOCATION; - - SeamELOperandResolveStatus status = new SeamELOperandResolveStatus(expr); - ELInvocationExpression left = expr; - - List<ISeamContextVariable> resolvedVariables = new ArrayList<ISeamContextVariable>(); + public List<ISeamContextVariable> resolveVariables(IFile file, ELInvocationExpression expr, boolean isFinal, boolean onlyEqualNames) { ISeamProject project = SeamCorePlugin.getSeamProject(file.getProject(), false); ScopeType scope = getScope(project, file); + return resolveVariables(project, scope, expr, isFinal, onlyEqualNames); + } - if (expr.getLeft() != null && isArgument) { - left = expr.getLeft(); - resolvedVariables = resolveVariables(project, scope, left, false, - true); // is Final and equal names are because of - // we have no more to resolve the parts of expression, - // but we have to resolve arguments of probably a message component - } else if (expr.getLeft() == null && isIncomplete) { - resolvedVariables = resolveVariables(project, scope, expr, true, - returnEqualedVariablesOnly); + protected TypeInfoCollector.MemberInfo getMemberInfoByVariable(ISeamContextVariable var, boolean onlyEqualNames) { + return SeamExpressionResolver.getMemberInfoByVariable(var, true, this); + } + + protected void setImage(TextProposal proposal, ISeamContextVariable var) { + if (isSeamMessagesComponentVariable((ISeamContextVariable)var)) { + proposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE); } else { - while(left != null) { - List<ISeamContextVariable>resolvedVars = new ArrayList<ISeamContextVariable>(); - resolvedVars = resolveVariables(project, scope, - left, left == expr, - returnEqualedVariablesOnly); - if (resolvedVars != null && !resolvedVars.isEmpty()) { - resolvedVariables = resolvedVars; - status.setLastResolvedToken(left); - break; - } - left = (ELInvocationExpression)left.getLeft(); - } + proposal.setImage(getELProposalImage()); } + } - // Save all resolved variables. It's useful for incremental validation. - if(resolvedVariables != null && !resolvedVariables.isEmpty()) { - status.setUsedVariables(resolvedVariables); - } + protected void setUsedVariables(ELOperandResolveStatus status, List<ISeamContextVariable> variables) { + ((SeamELOperandResolveStatus)status).setUsedVariables(variables); + } - if (status.getResolvedTokens() == null && - !returnEqualedVariablesOnly && - expr != null && - isIncomplete) { - // no vars are resolved - // the tokens are the part of var name ended with a separator (.) - resolvedVariables = resolveVariables(project, scope, expr, true, returnEqualedVariablesOnly); - Set<TextProposal> proposals = new TreeSet<TextProposal>(TextProposal.KB_PROPOSAL_ORDER); - for (ISeamContextVariable var : resolvedVariables) { - String varName = var.getName(); - if(varName.startsWith(operand.getText())) { - TextProposal proposal = new TextProposal(); - proposal.setReplacementString(varName.substring(operand.getLength())); - if (isSeamMessagesComponentVariable(var)) { - proposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE); - } else { - proposal.setImage(SEAM_EL_PROPOSAL_IMAGE); - } - proposals.add(proposal); - } - } - status.setProposals(proposals); - return status; - } + protected boolean isSingularAttribute(ISeamContextVariable var) { + return var instanceof IBijectedAttribute; + } - // Here we have a list of vars for some part of expression - // OK. we'll proceed with members of these vars - if (status.getResolvedTokens() == status.getTokens()) { - // First segment is the last one - Set<TextProposal> proposals = new TreeSet<TextProposal>(TextProposal.KB_PROPOSAL_ORDER); - // In some cases there may be a few references to the same variable name. - // For example @Factory and @DataModel. We should use @DataModel instead of @Factory - // method which returns null. - // See https://jira.jboss.org/jira/browse/JBIDE-3694 - TypeInfoCollector.MemberInfo bijectedAttribute = null; - for (ISeamContextVariable var : resolvedVariables) { - if(var instanceof IBijectedAttribute) { - bijectedAttribute = SeamExpressionResolver.getMemberInfoByVariable(var, true, this); - } - String varName = var.getName(); - if(operand.getLength()<=varName.length()) { - TextProposal proposal = new TextProposal(); - proposal.setReplacementString(varName.substring(operand.getLength())); - if (isSeamMessagesComponentVariable(var)) { - proposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE); - } else { - proposal.setImage(SEAM_EL_PROPOSAL_IMAGE); - } - proposals.add(proposal); - } else if(returnEqualedVariablesOnly) { - TextProposal proposal = new TextProposal(); - proposal.setReplacementString(varName); - if (isSeamMessagesComponentVariable(var)) { - proposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE); - } else { - proposal.setImage(SEAM_EL_PROPOSAL_IMAGE); - } - proposals.add(proposal); - } - status.setMemberOfResolvedOperand(bijectedAttribute!=null?bijectedAttribute:SeamExpressionResolver.getMemberInfoByVariable(var, true, this)); - } - status.setLastResolvedToken(expr); - status.setProposals(proposals); - return status; + protected void setImage(TextProposal kbProposal, TypeInfoCollector.MemberPresentation proposal) { + if (proposal.getMember() instanceof MessagesInfo) { + kbProposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE); + } else { + super.setImage(kbProposal, proposal); } - - // First segment is found - proceed with next tokens - List<TypeInfoCollector.MemberInfo> members = new ArrayList<TypeInfoCollector.MemberInfo>(); - for (ISeamContextVariable var : resolvedVariables) { - TypeInfoCollector.MemberInfo member = SeamExpressionResolver.getMemberInfoByVariable(var, returnEqualedVariablesOnly, this); - if (member != null && !members.contains(member)) - members.add(member); - } - //process segments one by one - if(left != null) while(left != expr) { - left = (ELInvocationExpression)left.getParent(); - if (left != expr) { // inside expression - if(left instanceof ELArgumentInvocation) { - String s = "#{" + left.getLeft().toString() + collectionAdditionForCollectionDataModel + "}"; - ELParser p = factory.createParser(); - ELInvocationExpression expr1 = (ELInvocationExpression)p.parse(s).getInstances().get(0).getExpression(); - members = resolveSegment(expr1.getLeft(), members, status, returnEqualedVariablesOnly, varIsUsed); - members = resolveSegment(expr1, members, status, returnEqualedVariablesOnly, varIsUsed); - if(status.getLastResolvedToken() == expr1) { - status.setLastResolvedToken(left); - } - } else { - members = resolveSegment(left, members, status, returnEqualedVariablesOnly, varIsUsed); - } - } else { // Last segment - resolveLastSegment((ELInvocationExpression)operand, members, status, returnEqualedVariablesOnly, varIsUsed); - break; - } - } - - if(status.getProposals().isEmpty() && status.getUnpairedGettersOrSetters()!=null) { - status.clearUnpairedGettersOrSetters(); - } - return status; } - private List<TypeInfoCollector.MemberInfo> resolveSegment(ELInvocationExpression expr, - List<TypeInfoCollector.MemberInfo> members, - ELOperandResolveStatus status, - boolean returnEqualedVariablesOnly, boolean varIsUsed) { - LexicalToken lt = (expr instanceof ELPropertyInvocation) - ? ((ELPropertyInvocation)expr).getName() - : (expr instanceof ELMethodInvocation) - ? ((ELMethodInvocation)expr).getName() - : null; - String name = lt != null ? lt.getText() : ""; // token.getText(); - if (expr.getType() == ELObjectType.EL_PROPERTY_INVOCATION) { - // Find properties for the token - List<TypeInfoCollector.MemberInfo> newMembers = new ArrayList<TypeInfoCollector.MemberInfo>(); - for (TypeInfoCollector.MemberInfo mbr : members) { - if (mbr.getMemberType() == null) continue; - TypeInfoCollector infos = mbr.getTypeCollector(varIsUsed); - if (TypeInfoCollector.isNotParameterizedCollection(mbr) || TypeInfoCollector.isResourceBundle(mbr.getMemberType())) { - status.setMapOrCollectionOrBundleAmoungTheTokens(); - } - List<TypeInfoCollector.MemberInfo> properties = infos.getProperties(); - for (TypeInfoCollector.MemberInfo property : properties) { - StringBuffer propertyName = new StringBuffer(property.getName()); - if (property instanceof TypeInfoCollector.MethodInfo) { // Setter or getter - propertyName.delete(0, (propertyName.charAt(0) == 'i' ? 2 : 3)); - propertyName.setCharAt(0, Character.toLowerCase(propertyName.charAt(0))); - } - if (name.equals(propertyName.toString())) { - newMembers.add(property); - } - } - } - members = newMembers; - if (members != null && !members.isEmpty()) - status.setLastResolvedToken(expr); - } - if (expr.getType() == ELObjectType.EL_METHOD_INVOCATION) { - // Find methods for the token - if (name.indexOf('(') != -1) { - name = name.substring(0, name.indexOf('(')); - } - List<TypeInfoCollector.MemberInfo> newMembers = new ArrayList<TypeInfoCollector.MemberInfo>(); - for (TypeInfoCollector.MemberInfo mbr : members) { - if (mbr.getMemberType() == null) continue; - TypeInfoCollector infos = mbr.getTypeCollector(); - if (TypeInfoCollector.isNotParameterizedCollection(mbr) || TypeInfoCollector.isResourceBundle(mbr.getMemberType())) { - status.setMapOrCollectionOrBundleAmoungTheTokens(); - } - List<TypeInfoCollector.MemberInfo> methods = infos.getMethods(); - for (TypeInfoCollector.MemberInfo method : methods) { - if (name.equals(method.getName())) { - newMembers.add(method); - } - } - } - members = newMembers; - if (members != null && !members.isEmpty()) - status.setLastResolvedToken(expr); - } - return members; + protected boolean isSingularMember(TypeInfoCollector.MemberInfo mbr) { + return (mbr instanceof MessagesInfo); } - private void resolveLastSegment(ELInvocationExpression expr, - List<TypeInfoCollector.MemberInfo> members, - ELOperandResolveStatus status, - boolean returnEqualedVariablesOnly, boolean varIsUsed) { - Set<TextProposal> kbProposals = new TreeSet<TextProposal>(TextProposal.KB_PROPOSAL_ORDER); - - if (expr.getType() == ELObjectType.EL_PROPERTY_INVOCATION && ((ELPropertyInvocation)expr).getName() == null) { - // return all the methods + properties - for (TypeInfoCollector.MemberInfo mbr : members) { - if (mbr instanceof MessagesInfo) { - // Surround the "long" keys containing the dots with [' '] - TreeSet<String> keys = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER); - keys.addAll(((MessagesInfo)mbr).getKeys()); - Iterator<String> sortedKeys = keys.iterator(); - while(sortedKeys.hasNext()) { - String key = sortedKeys.next(); - if (key == null || key.length() == 0) - continue; - if (key.indexOf('.') != -1) { - TextProposal proposal = new TextProposal(); - proposal.setReplacementString("['" + key + "']"); - proposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE); - - kbProposals.add(proposal); - } else { - TextProposal proposal = new TextProposal(); - proposal.setReplacementString(key); - proposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE); - - kbProposals.add(proposal); - } - } + protected void processSingularMember(TypeInfoCollector.MemberInfo mbr, Set<TextProposal> kbProposals) { + if (mbr instanceof MessagesInfo) { + // Surround the "long" keys containing the dots with [' '] + TreeSet<String> keys = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER); + keys.addAll(((MessagesInfo)mbr).getKeys()); + Iterator<String> sortedKeys = keys.iterator(); + while(sortedKeys.hasNext()) { + String key = sortedKeys.next(); + if (key == null || key.length() == 0) continue; - } - if (mbr.getMemberType() == null) { - continue; - } - TypeInfoCollector infos = mbr.getTypeCollector(varIsUsed); - if (TypeInfoCollector.isNotParameterizedCollection(mbr) || TypeInfoCollector.isResourceBundle(mbr.getMemberType())) { - status.setMapOrCollectionOrBundleAmoungTheTokens(); - } - - Set<String> methodPresentations = - infos.getMethodPresentationStrings(); - if (methodPresentations != null) { - for (String presentation : methodPresentations) { - TextProposal proposal = new TextProposal(); - proposal.setReplacementString(presentation); - proposal.setImage(SEAM_EL_PROPOSAL_IMAGE); - - kbProposals.add(proposal); - } - } - Set<String> propertyPresentations = - infos.getPropertyPresentationStrings(status.getUnpairedGettersOrSetters()); - if (propertyPresentations != null) { - for (String presentation : propertyPresentations) { - TextProposal proposal = new TextProposal(); - proposal.setReplacementString(presentation); - proposal.setImage(SEAM_EL_PROPOSAL_IMAGE); - - kbProposals.add(proposal); - } - } - } - } else - if(expr.getType() != ELObjectType.EL_ARGUMENT_INVOCATION) - //actually any case -// if (token.getType() == ELOperandToken.EL_VARIABLE_NAME_TOKEN || -// token.getType() == ELOperandToken.EL_PROPERTY_NAME_TOKEN || -// token.getType() == ELOperandToken.EL_METHOD_TOKEN) - { - // return filtered methods + properties - Set<TypeInfoCollector.MemberPresentation> proposalsToFilter = new TreeSet<TypeInfoCollector.MemberPresentation>(TypeInfoCollector.MEMBER_PRESENTATION_COMPARATOR); - for (TypeInfoCollector.MemberInfo mbr : members) { - if (mbr instanceof MessagesInfo) { - Collection<String> keys = ((MessagesInfo)mbr).getKeys(); - for (String key : keys) { - proposalsToFilter.add(new TypeInfoCollector.MemberPresentation(key, mbr)); - } - continue; - } - if (mbr.getMemberType() == null) continue; - TypeInfoCollector infos = mbr.getTypeCollector(); - if (TypeInfoCollector.isNotParameterizedCollection(mbr) || TypeInfoCollector.isResourceBundle(mbr.getMemberType())) { - status.setMapOrCollectionOrBundleAmoungTheTokens(); - } - proposalsToFilter.addAll(infos.getMethodPresentations()); - proposalsToFilter.addAll(infos.getPropertyPresentations(status.getUnpairedGettersOrSetters())); - status.setMemberOfResolvedOperand(mbr); - } - for (TypeInfoCollector.MemberPresentation proposal : proposalsToFilter) { - // We do expect nothing but name for method tokens (No round brackets) - String filter = expr.getMemberName(); - if(filter == null) filter = ""; - if(returnEqualedVariablesOnly) { - // This is used for validation. - if (proposal.getPresentation().equals(filter)) { - TextProposal kbProposal = new TextProposal(); - kbProposal.setReplacementString(proposal.getPresentation()); - - if (proposal.getMember() instanceof MessagesInfo) { - kbProposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE); - } else { - kbProposal.setImage(SEAM_EL_PROPOSAL_IMAGE); - } - - kbProposals.add(kbProposal); - - status.setMemberOfResolvedOperand(proposal.getMember()); - if(status.getUnpairedGettersOrSetters()!=null) { - TypeInfoCollector.MethodInfo unpirMethod = status.getUnpairedGettersOrSetters().get(filter); - status.clearUnpairedGettersOrSetters(); - if(unpirMethod!=null) { - status.getUnpairedGettersOrSetters().put(filter, unpirMethod); - } - } - break; - } - } else if (proposal.getPresentation().startsWith(filter)) { - // This is used for CA. - TextProposal kbProposal = new TextProposal(); - kbProposal.setReplacementString(proposal.getPresentation().substring(filter.length())); - kbProposal.setImage(SEAM_EL_PROPOSAL_IMAGE); + if (key.indexOf('.') != -1) { + TextProposal proposal = new TextProposal(); + proposal.setReplacementString("['" + key + "']"); + proposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE); - kbProposals.add(kbProposal); - } - } - } else if(expr.getType() == ELObjectType.EL_ARGUMENT_INVOCATION) { - Set<TypeInfoCollector.MemberPresentation> proposalsToFilter = new TreeSet<TypeInfoCollector.MemberPresentation>(TypeInfoCollector.MEMBER_PRESENTATION_COMPARATOR); - boolean isMessages = false; - for (TypeInfoCollector.MemberInfo mbr : members) { - if (mbr instanceof MessagesInfo) { - isMessages = true; - Collection<String> keys = ((MessagesInfo)mbr).getKeys(); - for (String key : keys) { - proposalsToFilter.add(new TypeInfoCollector.MemberPresentation(key, mbr)); - } - continue; - } - if (mbr.getMemberType() == null) continue; - try { - if(TypeInfoCollector.isInstanceofType(mbr.getMemberType(), "java.util.Map")) { - status.setMapOrCollectionOrBundleAmoungTheTokens(); - //if map/collection is parameterized, we might return member info for value type. - return; - } - } catch (JavaModelException jme) { - //ignore - } - status.setMemberOfResolvedOperand(mbr); - } - - String filter = expr.getMemberName(); - boolean bSurroundWithQuotes = false; - if(filter == null) { - filter = ""; - bSurroundWithQuotes = true; - } else { - if((filter.startsWith("'") || filter.startsWith("\"")) - && (filter.endsWith("'") || filter.endsWith("\""))) { - filter = filter.substring(1, filter.length() - 1); + kbProposals.add(proposal); } else { - //Value is set as expression itself, we cannot compute it - if(isMessages) status.setMapOrCollectionOrBundleAmoungTheTokens(); - return; - } - } - - for (TypeInfoCollector.MemberPresentation proposal : proposalsToFilter) { - if(returnEqualedVariablesOnly) { - // This is used for validation. - if (proposal.getPresentation().equals(filter)) { - TextProposal kbProposal = new TextProposal(); - kbProposal.setReplacementString(proposal.getPresentation()); - - if (proposal.getMember() instanceof MessagesInfo) { - kbProposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE); - } else { - kbProposal.setImage(SEAM_EL_PROPOSAL_IMAGE); - } - - kbProposals.add(kbProposal); - - status.setMemberOfResolvedOperand(proposal.getMember()); - if(status.getUnpairedGettersOrSetters()!=null) { - TypeInfoCollector.MethodInfo unpirMethod = status.getUnpairedGettersOrSetters().get(filter); - status.clearUnpairedGettersOrSetters(); - if(unpirMethod!=null) { - status.getUnpairedGettersOrSetters().put(filter, unpirMethod); - } - } - break; - } - } else if (proposal.getPresentation().startsWith(filter)) { - // This is used for CA. - TextProposal kbProposal = new TextProposal(); + TextProposal proposal = new TextProposal(); + proposal.setReplacementString(key); + proposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE); - String replacementString = proposal.getPresentation().substring(filter.length()); - if (bSurroundWithQuotes) { - replacementString = "'" + replacementString + "']"; - } - - kbProposal.setReplacementString(replacementString); - kbProposal.setImage(SEAM_EL_PROPOSAL_IMAGE); - - kbProposals.add(kbProposal); + kbProposals.add(proposal); } } } - status.setProposals(kbProposals); - if (status.isOK()){ - status.setLastResolvedToken(expr); + } + + protected void filterSingularMember(TypeInfoCollector.MemberInfo mbr, Set<TypeInfoCollector.MemberPresentation> proposalsToFilter) { + Collection<String> keys = ((MessagesInfo)mbr).getKeys(); + for (String key : keys) { + proposalsToFilter.add(new TypeInfoCollector.MemberPresentation(key, mbr)); } } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2009-06-22 17:08:10 UTC (rev 16121) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2009-06-22 17:10:32 UTC (rev 16122) @@ -352,7 +352,7 @@ if(ex instanceof ELInvocationExpression) { ELInvocationExpression expr = (ELInvocationExpression)ex; try { - member = engine.resolveSeamEL(null, expr, false); + member = engine.resolveEL(null, expr, false); } catch (StringIndexOutOfBoundsException e) { e.printStackTrace(); } catch (BadLocationException e) { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2009-06-22 17:08:10 UTC (rev 16121) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2009-06-22 17:10:32 UTC (rev 16122) @@ -382,7 +382,7 @@ int offset = operand.length(); if (!operand.endsWith(".")) { //$NON-NLS-1$ SeamELOperandResolveStatus status = - engine.resolveELOperand(file, operandToken, true, varListForCurentValidatedNode, elVarSearcher); + (SeamELOperandResolveStatus)engine.resolveELOperand(file, operandToken, true, varListForCurentValidatedNode, elVarSearcher); if(status.isError()) { if(revalidateUnresolvedELs) {