From 3fad7bb5475e837c14d329081b4444d955e3d2c5 Mon Sep 17 00:00:00 2001 From: Kushal Munir < kmunir@ca.ibm.com> Date: Thu, 31 May 2007 18:55:35 +0000 Subject: [PATCH] [189433] [Search] [contributed] Dialog for selecting folder to search should display archive files. We do this by adding additional criteria to our viewer filter. --- .../search/SystemSearchRemoteFolderDialog.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderDialog.java index 4c71f24481f..8d63c908345 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderDialog.java @@ -6,10 +6,13 @@ * * Contributors: * Kushal Munir (IBM) - initial API and implementation. + * Kevin Doyle (IBM) [189433] - Added Viewer Filter to display directories & archives ********************************************************************************/ package org.eclipse.rse.internal.files.ui.search; import org.eclipse.rse.files.ui.dialogs.SystemRemoteFolderDialog; +import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter; +import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.swt.widgets.Shell; /** @@ -17,6 +20,8 @@ import org.eclipse.swt.widgets.Shell; */ public class SystemSearchRemoteFolderDialog extends SystemRemoteFolderDialog { + private SystemActionViewerFilter _filter; + /** * Constructor. * @param shell the parent shell. @@ -34,6 +39,17 @@ public class SystemSearchRemoteFolderDialog extends SystemRemoteFolderDialog { super(shell, title); } + public SystemActionViewerFilter getViewerFilter() + { + if (_filter == null) + { + _filter = new SystemActionViewerFilter(); + Class[] types = {IRemoteFile.class}; + _filter.addFilterCriterion(types, "isDirectory", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + _filter.addFilterCriterion(types, "isArchive", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + } + return _filter; + } /** * Creates an instance of the select form for search {@link SystemSearchRemoteFolderForm}