Author: scabanovich Date: 2007-08-08 08:40:49 -0400 (Wed, 08 Aug 2007) New Revision: 2958 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/SeamPromptingProvider.java Log: JBIDE-672 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 2007-08-08 12:32:17 UTC (rev 2957) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2007-08-08 12:40:49 UTC (rev 2958) @@ -144,7 +144,7 @@ ISeamProject project = ((ISeamElement)factory).getSeamProject(); // ISeamProject project = getSeamProject(factory.getResource()); if (project != null) { - List<ISeamContextVariable> resolvedValues = resolveVariables(project, factory.getScope(), value, onlyEqualNames); + List<ISeamContextVariable> resolvedValues = resolveVariables(project, null /* factory.getScope()*/, value, onlyEqualNames); for (ISeamContextVariable var : resolvedValues) { if (var.getName().equals(value)) { member = getMemberByVariable(var, onlyEqualNames); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamPromptingProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamPromptingProvider.java 2007-08-08 12:32:17 UTC (rev 2957) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamPromptingProvider.java 2007-08-08 12:40:49 UTC (rev 2958) @@ -7,6 +7,7 @@ import java.util.TreeSet; import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.BadLocationException; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.project.IPromptingProvider; import org.jboss.tools.seam.core.ISeamContextVariable; @@ -18,6 +19,8 @@ static String VARIABLES = "seam.variables"; static String MEMBERS = "seam.members"; + SeamELCompletionEngine engine= new SeamELCompletionEngine(); + public SeamPromptingProvider() {} public List getList(XModel model, String id, String prefix, @@ -40,6 +43,13 @@ list.addAll(set); return list; } else if(MEMBERS.equals(id)) { + try { + String prefix2 = SeamELCompletionEngine.getPrefix(prefix, prefix.length()); + List<String> suggestions = engine.getCompletions(p, f, prefix, prefix2, 2, true, null, null); + return suggestions; + } catch (BadLocationException e) { + return EMPTY_LIST; + } } return null;