Author: dazarov Date: 2011-08-23 13:30:56 -0400 (Tue, 23 Aug 2011) New Revision: 34173 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java Log: https://issues.jboss.org/browse/JBIDE-9571 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java 2011-08-23 17:29:58 UTC (rev 34172) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java 2011-08-23 17:30:56 UTC (rev 34173) @@ -173,11 +173,11 @@ for(ELSegment segment : segments){ if(!segment.isResolved()) - continue; + break; if(selection.getOffset() <= reference.getStartPosition()+segment.getSourceReference().getStartPosition() && - selection.getOffset()+selection.getLength() >= reference.getStartPosition()+segment.getSourceReference().getStartPosition()+segment.getSourceReference().getLength()){ - if(segment instanceof MessagePropertyELSegment || segment instanceof JavaMemberELSegment) + selection.getOffset()+selection.getLength() >= reference.getStartPosition()+segment.getSourceReference().getStartPosition()+segment.getSourceReference().getLength() && + (segment instanceof MessagePropertyELSegment || segment instanceof JavaMemberELSegment)){ return segment; } }