[jbosstools-commits] JBoss Tools SVN: r25792 - in trunk: jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring and 1 other directories.

Author: dazarov Date: 2010-10-13 10:59:30 -0400 (Wed, 13 Oct 2010) New Revision: 25792 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java Log: https://jira.jboss.org/browse/JBIDE-7299 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2010-10-13 14:58:31 UTC (rev 25791) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2010-10-13 14:59:30 UTC (rev 25792) @@ -431,9 +431,7 @@ name="el-RenameMethodParticipant"> <enablement> <with variable="element"> - <or> - <instanceof value="org.eclipse.jdt.core.IMethod"/> - </or> + <instanceof value="org.eclipse.jdt.core.IMethod"/> </with> </enablement> </renameParticipant> Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java 2010-10-13 14:58:31 UTC (rev 25791) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java 2010-10-13 14:59:30 UTC (rev 25792) @@ -27,6 +27,8 @@ import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.core.refactoring.TextFileChange; import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; +import org.eclipse.ltk.core.refactoring.participants.ISharableParticipant; +import org.eclipse.ltk.core.refactoring.participants.RefactoringArguments; import org.eclipse.ltk.core.refactoring.participants.RenameParticipant; import org.eclipse.ltk.internal.core.refactoring.Messages; import org.eclipse.text.edits.MultiTextEdit; @@ -38,19 +40,17 @@ import org.jboss.tools.jsf.ui.JsfUIMessages; import org.jboss.tools.jst.web.kb.refactoring.RefactorSearcher; -public class RenameMethodParticipant extends RenameParticipant{ +public class RenameMethodParticipant extends RenameParticipant implements ISharableParticipant{ private IJavaElement element; private String oldName; private String newName; - private SeamRenameMethodSearcher searcher; + private RenameMethodSearcher searcher; private RefactoringStatus status; private CompositeChange rootChange; private TextFileChange lastChange; private ArrayList<String> keys = new ArrayList<String>(); + private ArrayList<Object> otherElements = new ArrayList<Object>(); - private static boolean added = false; - - @Override public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) throws OperationCanceledException { @@ -58,24 +58,38 @@ return status; if(element instanceof IMethod){ IMethod method = (IMethod)element; - if(method != null && !added){ - if(searcher.isGetter(method)) - status.addWarning(JsfUIMessages.RENAME_METHOD_PARTICIPANT_GETTER_WARNING); - else if(searcher.isSetter(method)) - status.addWarning(JsfUIMessages.RENAME_METHOD_PARTICIPANT_SETTER_WARNING); - added = true; + IMethod anotherMethod = getAnotherMethod(); + if(method != null){ + if(searcher.isGetter(method)){ + if(anotherMethod == null || searcher.isGetter(anotherMethod)) + status.addWarning(JsfUIMessages.RENAME_METHOD_PARTICIPANT_GETTER_WARNING); + + }else if(searcher.isSetter(method)){ + if(anotherMethod == null || searcher.isSetter(anotherMethod)) + status.addWarning(JsfUIMessages.RENAME_METHOD_PARTICIPANT_SETTER_WARNING); + } + + searcher.findELReferences(); } } - searcher.findELReferences(); - return status; } + + private IMethod getAnotherMethod(){ + for(Object object : otherElements) + if(object instanceof IMethod) + return (IMethod)object; + return null; + } @Override public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException { - return rootChange; + if(rootChange.getChildren().length > 0) + return rootChange; + + return null; } @Override @@ -85,6 +99,9 @@ @Override protected boolean initialize(Object element) { + if(!getArguments().getUpdateReferences()) + return false; + if(element instanceof IMethod){ IMethod method = (IMethod)element; status = new RefactoringStatus(); @@ -96,8 +113,7 @@ oldName = method.getElementName(); newName = RefactorSearcher.getPropertyName(method, getArguments().getNewName()); - searcher = new SeamRenameMethodSearcher((IFile)method.getResource(), oldName); - added = false; + searcher = new RenameMethodSearcher((IFile)method.getResource(), oldName); return true; } return false; @@ -116,8 +132,7 @@ oldName = method.getElementName(); this.newName = newName; - searcher = new SeamRenameMethodSearcher((IFile)method.getResource(), oldName); - added = false; + searcher = new RenameMethodSearcher((IFile)method.getResource(), oldName); return true; } return false; @@ -152,9 +167,9 @@ } } - class SeamRenameMethodSearcher extends RefactorSearcher{ + class RenameMethodSearcher extends RefactorSearcher{ ProjectsSet projectSet=null; - public SeamRenameMethodSearcher(IFile file, String name){ + public RenameMethodSearcher(IFile file, String name){ super(file, name, element); ELProjectSetExtension[] extensions = ELProjectSetExtension.getInstances(); if(extensions.length > 0){ @@ -205,4 +220,8 @@ } } + public void addElement(Object element, RefactoringArguments arguments) { + otherElements.add(element); + } + } 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 2010-10-13 14:58:31 UTC (rev 25791) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java 2010-10-13 14:59:30 UTC (rev 25792) @@ -213,6 +213,9 @@ continue; List<ELSegment> segments = resolution.findSegmentsByJavaElement(javaElement); + + if(segments == null) + continue; for(ELSegment segment : segments){ match(file, offset+segment.getSourceReference().getStartPosition(), segment.getSourceReference().getLength());