From eb298559e614b4579d66a37d881c9ca51e1a96b1 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 31 May 2006 19:55:58 +0000 Subject: [PATCH] honour the search archives optoin --- .../rse/services/local/search/LocalSearchHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchHandler.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchHandler.java index 484a8b7601a..24e8203f380 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchHandler.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchHandler.java @@ -110,6 +110,7 @@ public class LocalSearchHandler implements ISearchHandler _fs = fileService; _searchString = searchConfig.getSearchString(); + boolean includeSubfolders = _searchString.isIncludeSubfolders(); @@ -187,7 +188,7 @@ public class LocalSearchHandler implements ISearchHandler boolean isDirectory = theFile.isDirectory(); // is it an archive? - boolean isArchive = ArchiveHandlerManager.getInstance().isArchive(theFile); + boolean isArchive = ArchiveHandlerManager.getInstance().isArchive(theFile) && _searchString.isIncludeArchives(); String absPath = theFile.getAbsolutePath(); 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 // we need to get the // children and search those - if (isDirectory || isArchive || isVirtualDirectory) + if (isDirectory || (_searchString.isIncludeArchives() && (isArchive || isVirtualDirectory))) { if (!hasSearchedDirectory(theFile))