Author: akazakov Date: 2009-08-20 10:41:53 -0400 (Thu, 20 Aug 2009) New Revision: 17189 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java Log: https://jira.jboss.org/jira/browse/JBIDE-4760 - Fixed Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2009-08-20 14:35:00 UTC (rev 17188) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2009-08-20 14:41:53 UTC (rev 17189) @@ -10,10 +10,10 @@ ******************************************************************************/ package org.jboss.tools.common.el.core.resolver; +import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; +import java.util.List; import java.util.Map; -import java.util.Set; import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.Region; @@ -26,8 +26,8 @@ protected IFile resource; protected ELResolver[] elResolvers; - protected Map<Region, Set<Var>> vars = new HashMap<Region, Set<Var>>(); - protected Set<Var> allVars = new HashSet<Var>(); + protected Map<Region, List<Var>> vars = new HashMap<Region, List<Var>>(); + protected List<Var> allVars = new ArrayList<Var>(); /* * (non-Javadoc) @@ -65,7 +65,7 @@ * (non-Javadoc) */ public Var[] getVars(int offset) { - Set<Var> result = new HashSet<Var>(); + List<Var> result = new ArrayList<Var>(); for (Region region : vars.keySet()) { if(offset>=region.getOffset() && offset<=region.getOffset() + region.getLength()) { result.addAll(vars.get(region)); @@ -81,7 +81,7 @@ */ public void addVar(Region region, Var var) { if (this.vars.get(region) == null) { - this.vars.put(region, new HashSet<Var>()); + this.vars.put(region, new ArrayList<Var>()); } this.vars.get(region).add(var); allVars.add(var); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-08-20 14:35:00 UTC (rev 17188) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-08-20 14:41:53 UTC (rev 17189) @@ -242,12 +242,11 @@ l = l.getLeft(); } } + var.resolveValue("#{" + var.getElToken().getText() + suffix + "}"); //$NON-NLS-1$ //$NON-NLS-2$ } ELOperandResolveStatus oldElStatus = resolveELOperand(file, operand, returnEqualedVariablesOnly, false); status.getProposals().addAll(oldElStatus.getProposals()); - - var.resolveValue("#{" + var.getElToken().getText() + suffix + "}"); //$NON-NLS-1$ //$NON-NLS-2$ } if(!returnEqualedVariablesOnly && vars!=null) {