mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 321441.

Browse source
This commit is contained in:
Sergey Prigogin 2010-08-01 22:37:50 +00:00
parent a7d8236321
commit 8c16f89d45
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java
View file

@ -13,6 +13,7 @@
package org.eclipse.cdt.internal.ui.refactoring.rename; package org.eclipse.cdt.internal.ui.refactoring.rename;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashSet; import java.util.HashSet;
@ -160,7 +161,7 @@ public abstract class CRenameProcessorDelegate {
* @return A set of files containing references to the name, or <code>null</code> if * @return A set of files containing references to the name, or <code>null</code> if
* exhaustive file search is requested. * exhaustive file search is requested.
*/ */
private IResource[] getFileFilter() { private Collection<IResource> getFileFilter() {
if ((getSelectedOptions() & CRefactory.OPTION_EXHAUSTIVE_FILE_SEARCH) != 0) { if ((getSelectedOptions() & CRefactory.OPTION_EXHAUSTIVE_FILE_SEARCH) != 0) {
return null; return null;
} }
@ -200,7 +201,7 @@ public abstract class CRenameProcessorDelegate {
} }
} }
return files.toArray(new IResource[files.size()]); return files;
} }
public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException { public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException {
@ -216,9 +217,13 @@ public abstract class CRenameProcessorDelegate {
// perform text-search // perform text-search
fMatches= new ArrayList<CRefactoringMatch>(); fMatches= new ArrayList<CRefactoringMatch>();
TextSearchWrapper txtSearch= getManager().getTextSearch(); TextSearchWrapper txtSearch= getManager().getTextSearch();
Collection<IResource> fileFilter = getFileFilter();
if (!fileFilter.contains(file)) {
fileFilter.add(file);
}
IStatus stat= txtSearch.searchWord(getSearchScope(), file, getSelectedWorkingSet(), IStatus stat= txtSearch.searchWord(getSearchScope(), file, getSelectedWorkingSet(),
getFileFilter(), getManager().getCCppPatterns(), getArgument().getName(), fileFilter.toArray(new IResource[fileFilter.size()]), getManager().getCCppPatterns(),
new SubProgressMonitor(monitor, 1), fMatches); getArgument().getName(), new SubProgressMonitor(monitor, 1), fMatches);
if (monitor.isCanceled()) { if (monitor.isCanceled()) {
throw new OperationCanceledException(); throw new OperationCanceledException();
} }