Author: scabanovich
Date: 2009-07-29 08:31:13 -0400 (Wed, 29 Jul 2009)
New Revision: 16867
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamPromptingProvider.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4675
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 2009-07-29
11:49:48 UTC (rev 16866)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamPromptingProvider.java 2009-07-29
12:31:13 UTC (rev 16867)
@@ -18,8 +18,10 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.BadLocationException;
+import org.jboss.tools.common.el.core.resolver.Var;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.project.IPromptingProvider;
+import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.seam.core.ISeamContextVariable;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -29,7 +31,7 @@
public static String VARIABLES = "seam.variables"; //$NON-NLS-1$
public static String MEMBERS = "seam.members"; //$NON-NLS-1$
-// SeamELCompletionEngine engine= new SeamELCompletionEngine();
+ SeamELCompletionEngine engine = new SeamELCompletionEngine();
public SeamPromptingProvider() {}
@@ -47,7 +49,7 @@
return list;
} else if(VARIABLES.equals(id)) {
p.resolve();
- Set<ISeamContextVariable> vs = p.getVariables();
+ Set<ISeamContextVariable> vs = p.getVariables(true);
Set<Object> set = new TreeSet<Object>();
for (ISeamContextVariable v : vs) {
set.add(v.getName());
@@ -57,14 +59,16 @@
return list;
} else if(MEMBERS.equals(id)) {
//TODO either refactor or remove this class
-// try {
-// String prefix2 = SeamELCompletionEngine.getPrefix(prefix, prefix.length());
-// List<String> suggestions = engine.getCompletions(p, f, prefix, prefix2, 2,
true, null);
-// return suggestions;
-// } catch (BadLocationException e) {
-// return EMPTY_LIST;
-// }
- return EMPTY_LIST;
+ try {
+ List<TextProposal> proposals = engine.getCompletions(f, null, prefix,
prefix.length(), false, new ArrayList<Var>());
+ List<String> suggestions = new ArrayList<String>();
+ if(proposals != null) for (TextProposal proposal: proposals) {
+ suggestions.add(proposal.getReplacementString());
+ }
+ return suggestions;
+ } catch (BadLocationException e) {
+ return EMPTY_LIST;
+ }
}
return null;
}