mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-08 17:45:24 +02:00
Code Issues Wiki Activity

honour the search archives optoin

Browse source
This commit is contained in:
David McKnight 2006-05-31 19:55:58 +00:00
parent f1fadfdab5
commit eb298559e6
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchHandler.java
View file

@ -111,6 +111,7 @@ public class LocalSearchHandler implements ISearchHandler
_searchString = searchConfig.getSearchString(); _searchString = searchConfig.getSearchString();
boolean includeSubfolders = _searchString.isIncludeSubfolders(); boolean includeSubfolders = _searchString.isIncludeSubfolders();
if (includeSubfolders) if (includeSubfolders)
@ -187,7 +188,7 @@ public class LocalSearchHandler implements ISearchHandler
boolean isDirectory = theFile.isDirectory(); boolean isDirectory = theFile.isDirectory();
// is it an archive? // is it an archive?
boolean isArchive = ArchiveHandlerManager.getInstance().isArchive(theFile); boolean isArchive = ArchiveHandlerManager.getInstance().isArchive(theFile) && _searchString.isIncludeArchives();
String absPath = theFile.getAbsolutePath(); String absPath = theFile.getAbsolutePath();
String compareStr = theFile.getName(); String compareStr = theFile.getName();
@ -299,7 +300,7 @@ public class LocalSearchHandler implements ISearchHandler
// if it is a directory, or an archive, or a virtual directory, then // if it is a directory, or an archive, or a virtual directory, then
// we need to get the // we need to get the
// children and search those // children and search those
if (isDirectory || isArchive || isVirtualDirectory) if (isDirectory || (_searchString.isIncludeArchives() && (isArchive || isVirtualDirectory)))
{ {
if (!hasSearchedDirectory(theFile)) if (!hasSearchedDirectory(theFile))