mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 21:15:23 +02:00
Code Issues Wiki Activity

[194865] fix: [local][Archives] Searching contents of a file in an Archive doesn't work

Browse source
This commit is contained in:
Xuan Chen 2008-01-03 15:41:07 +00:00
parent 34b382d22f
commit ec94488aa8
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,8 @@
* *
* Contributors: * Contributors:
* Michael Berger (IBM) - Bug 147791 - symbolic links can cause circular search. * Michael Berger (IBM) - Bug 147791 - symbolic links can cause circular search.
* Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread * Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI threadj
* Xuan Chen (IBM) - [194865] [local][Archives] Searching contents of a file in an Archive doesn't work
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.services.local.search; package org.eclipse.rse.internal.services.local.search;
@ -29,7 +30,6 @@ import java.util.Iterator;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.rse.internal.services.local.files.LocalHostFile; import org.eclipse.rse.internal.services.local.files.LocalHostFile;
import org.eclipse.rse.internal.services.local.files.LocalVirtualHostFile; import org.eclipse.rse.internal.services.local.files.LocalVirtualHostFile;
import org.eclipse.rse.internal.services.local.search.LocalSearchResult;
import org.eclipse.rse.services.clientserver.StringCompare; import org.eclipse.rse.services.clientserver.StringCompare;
import org.eclipse.rse.services.clientserver.SystemFileClassifier; import org.eclipse.rse.services.clientserver.SystemFileClassifier;
import org.eclipse.rse.services.clientserver.SystemSearchString; import org.eclipse.rse.services.clientserver.SystemSearchString;
@ -243,15 +243,19 @@ public class LocalSearchHandler implements ISearchHandler
/** TODO - how to store search results related to files /** TODO - how to store search results related to files
// if there is at least one match, then add the file to the // if there is at least one match, then add the file to the
// search results // search results
**/
if (results != null && results.length > 0) if (results != null && results.length > 0)
{ {
/*
file.setContents(IHostSearchResultsContentsType.getInstance(), _searchString.toString(), file.setContents(IHostSearchResultsContentsType.getInstance(), _searchString.toString(),
results); results);
*/
_searchConfig.addResult(file); _searchConfig.addResult(file);
_searchConfig.addResults(file, results);
} }
**/
_searchConfig.addResults(file, results); //_searchConfig.addResult(file);
} }
// otherwise add the file to the search results // otherwise add the file to the search results
else else