Author: akazakov Date: 2008-02-22 06:10:20 -0500 (Fri, 22 Feb 2008) New Revision: 6524 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java Log: http://jira.jboss.org/jira/browse/JBIDE-1803 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 2008-02-22 10:15:40 UTC (rev 6523) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-02-22 11:10:20 UTC (rev 6524) @@ -208,6 +208,17 @@ 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 resolveSeamELOperand(ISeamProject project, IFile file, String documentContent, CharSequence prefix, int position, boolean returnEqualedVariablesOnly, List<Var> vars, ElVarSearcher varSearcher) throws BadLocationException, StringIndexOutOfBoundsException { String oldEl = prefix.toString(); @@ -269,6 +280,9 @@ var.resolveValue("#{" + var.getElToken().getText() + suffix + "}"); } + if(!returnEqualedVariablesOnly && vars!=null) { + status.getProposals().addAll(getVarNameProposals(vars, prefix.toString())); + } return status; }