Author: akazakov Date: 2009-09-17 13:47:25 -0400 (Thu, 17 Sep 2009) New Revision: 17641 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java Log: https://jira.jboss.org/jira/browse/JBIDE-4771 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-09-17 17:18:22 UTC (rev 17640) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-09-17 17:47:25 UTC (rev 17641) @@ -376,17 +376,12 @@ SimpleELContext context = new SimpleELContext(); - ElVarSearcher elSearcher = new ElVarSearcher((ELCompletionEngine)resolver); - - List<Var> vars = elSearcher.findAllVars(file, offset); - - if(vars == null) - continue; - - context.setVars(vars); context.setResource(file); context.setElResolvers(resolvers); - + + List<Var> vars = ElVarSearcher.findAllVars(context, offset, resolver); + context.setVars(vars); + ELResolution resolution = resolver.resolve(context, operand); if(resolution == null) @@ -407,4 +402,4 @@ } } } -} +} \ No newline at end of file