[jbosstools-commits] JBoss Tools SVN: r37700 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring and 1 other directories.

Author: dazarov Date: 2012-01-06 16:01:40 -0500 (Fri, 06 Jan 2012) New Revision: 37700 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RenameMessagePropertyProcessor.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java Log: Ctrl+Shift+G on a java element doesn't work for complex ELs https://issues.jboss.org/browse/JBIDE-10593 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RenameMessagePropertyProcessor.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RenameMessagePropertyProcessor.java 2012-01-06 20:43:13 UTC (rev 37699) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RenameMessagePropertyProcessor.java 2012-01-06 21:01:40 UTC (rev 37700) @@ -188,9 +188,6 @@ int offset = reference.getStartPosition(); for(ELExpression operand : reference.getEl()){ for (ELResolver resolver : resolvers) { - if (!(resolver instanceof ELCompletionEngine)) - continue; - ELResolution resolution = resolver.resolve(context, operand, offset); if(resolution == null) @@ -205,9 +202,6 @@ for(ELObject child : operand.getChildren()){ if(child instanceof ELExpression){ for (ELResolver resolver : resolvers) { - if (!(resolver instanceof ELCompletionEngine)) - continue; - ELResolution resolution = resolver.resolve(context, (ELExpression)child, offset); if(resolution == null) Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java 2012-01-06 20:43:13 UTC (rev 37699) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java 2012-01-06 21:01:40 UTC (rev 37700) @@ -271,7 +271,7 @@ private void resolveByResolvers(ELExpression operand, ELResolver[] resolvers, ELContext context, IRelevanceCheck[] checks, int offset, List<MatchArea> areas, IFile file){ for (int i = 0; i < resolvers.length; i++) { ELResolver resolver = resolvers[i]; - if (!(resolver instanceof ELCompletionEngine) || !checks[i].isRelevant(operand.getText())) + if (!checks[i].isRelevant(operand.getText())) continue; ELResolution resolution = resolver.resolve(context, operand, offset); @@ -496,9 +496,6 @@ .getResolvers(file); for (ELResolver resolver : resolvers) { - if (!(resolver instanceof ELCompletionEngine)) - continue; - SimpleELContext context = new SimpleELContext(); context.setResource(file); 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 2012-01-06 20:43:13 UTC (rev 37699) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2012-01-06 21:01:40 UTC (rev 37700) @@ -117,9 +117,6 @@ .getResolvers(file); for (ELResolver resolver : resolvers) { - if (!(resolver instanceof ELCompletionEngine)) - continue; - SimpleELContext context = new SimpleELContext(); context.setResource(file);