Attachment 138580 Details for Bug 279307 – patch to handle case where filter is selected from search dialog

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch to handle case where filter is selected from search dialog

patch.txt (text/plain), 3.03 KB, created by David McKnight

on 2009-06-08 10:47:20 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2009-06-08 10:47:20 EDT

Size: 3.03 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.files.ui
>Index: src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java,v
>retrieving revision 1.17
>diff -u -r1.17 SystemSearchPage.java
>--- src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java	25 Mar 2009 20:24:37 -0000	1.17
>+++ src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java	8 Jun 2009 14:44:43 -0000
>@@ -20,6 +20,7 @@
>  * David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
>  * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
>  * David McKnight  (IBM)  - [243495] [api] New: Allow file name search in Remote Search to not be case sensitive
>+ * David McKnight  (IBM)         - [279307] NPE when select a filter remove search dialog
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.files.ui.search;
>@@ -42,9 +43,11 @@
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.rse.core.IRSESystemType;
> import org.eclipse.rse.core.RSECorePlugin;
>+import org.eclipse.rse.core.filters.ISystemFilterReference;
> import org.eclipse.rse.core.model.IHost;
> import org.eclipse.rse.core.model.ISystemProfile;
> import org.eclipse.rse.core.model.ISystemRegistry;
>+import org.eclipse.rse.core.subsystems.ISubSystem;
> import org.eclipse.rse.internal.files.ui.Activator;
> import org.eclipse.rse.internal.files.ui.FileResources;
> import org.eclipse.rse.internal.files.ui.ISystemFileConstants;
>@@ -69,6 +72,7 @@
> import org.eclipse.rse.ui.SystemBasePlugin;
> import org.eclipse.rse.ui.SystemWidgetHelpers;
> import org.eclipse.rse.ui.messages.SystemMessageDialog;
>+import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
> import org.eclipse.search.internal.ui.SearchMessages;
> import org.eclipse.search.ui.ISearchPage;
> import org.eclipse.search.ui.ISearchPageContainer;
>@@ -453,6 +457,21 @@
> 			if (!selectFolderAction.wasCancelled()) {
> 				// store remote path
> 				IRemoteFile remoteFile = selectFolderAction.getSelectedFolder();
>+				if (remoteFile == null){
>+					// could have selected a filter reference
>+					Object value = selectFolderAction.getValue();
>+					if (value instanceof ISystemFilterReference){
>+						ISystemFilterReference fref = (ISystemFilterReference)value;
>+						ISubSystem ss = fref.getSubSystem();
>+					
>+						// target for filter should give the most relevant folder
>+						Object target = ss.getTargetForFilter(fref);
>+						if (target instanceof IRemoteFile){
>+							remoteFile = (IRemoteFile)target;
>+						}
>+					}
>+					
>+				}
> 				String folderPath = remoteFile.getAbsolutePath();
> 				
> 				// store connection and profile

Actions: View | Diff

Attachments on bug 279307: 138580