Attachment 72742 Details for Bug 187427 – Checks Search Archive's checkbox when selecting an archive or file in an archive

[patch] Checks Search Archive's checkbox when selecting an archive or file in an archive

patch.txt (text/plain), 3.78 KB, created by Kevin Doyle

on 2007-06-28 17:43:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Doyle

Created: 2007-06-28 17:43:52 EDT

Size: 3.78 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.10
>diff -u -r1.10 SystemSearchPage.java
>--- src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java	31 May 2007 20:15:39 -0000	1.10
>+++ src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java	28 Jun 2007 21:38:48 -0000
>@@ -14,6 +14,7 @@
>  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
>  * Kevin Doyle (IBM) - [182024] Folder field only initialized if selection supports search
>  * Kevin Doyle (IBM) - [189430] Limited System Types displayed in Folder Dialog
>+ * Kevin Doyle (IBM) - [187427] Selecting an Archive will check Search Archives checkbox
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.files.ui.search;
>@@ -41,6 +42,7 @@
> import org.eclipse.rse.internal.ui.view.search.SystemSearchUI;
> import org.eclipse.rse.internal.ui.view.search.SystemSearchViewPart;
> import org.eclipse.rse.services.clientserver.SystemSearchString;
>+import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
> import org.eclipse.rse.services.clientserver.messages.SystemMessage;
> import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
> import org.eclipse.rse.services.clientserver.search.SystemSearchUtil;
>@@ -442,6 +444,13 @@
> 				String connectionName = conn.getAliasName();
> 				
> 				setFolderText(profileName, connectionName, folderPath);
>+				
>+				String absPath = remoteFile.getAbsolutePath();
>+				boolean supportsSearch = remoteFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsSearch();
>+				boolean supportsArchiveManagement = remoteFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement();
>+				// if the file/folder is part of an archive select the search archives checkbox
>+				if (supportsSearch && supportsArchiveManagement && (remoteFile.isArchive() || (absPath.indexOf(ArchiveHandlerManager.VIRTUAL_SEPARATOR) > 0)))
>+					searchArchivesButton.setSelection(true);
> 			}
> 		}
> 		
>@@ -887,6 +896,7 @@
> 		String profileName = null;
> 		String connectionName = null;
> 		String folderName = null;
>+		boolean isPartOfArchive = false;
> 		
> 		// if selection is not empty, we handle structured selection or text selection
> 		if (selection != null && !selection.isEmpty()) {
>@@ -915,8 +925,11 @@
> 						IHost conn = remoteFile.getSystemConnection();
> 						profileName = conn.getSystemProfileName();
> 						connectionName = conn.getAliasName();
>-						folderName = remoteFile.getAbsolutePath();						
>+						folderName = remoteFile.getAbsolutePath();
> 					}
>+					String absPath = remoteFile.getAbsolutePath();
>+					// Determine if we support search + archives and selection is part of an archive
>+					isPartOfArchive = supportsSearch && supportsArchiveManagement && (remoteFile.isArchive() || (absPath.indexOf(ArchiveHandlerManager.VIRTUAL_SEPARATOR) > 0));
> 				}
> 			}
> 			// otherwise, if it is a text selection
>@@ -946,6 +959,12 @@
> 		// set the file name
> 		fileNameEditor.setFileNamesText(fileName);
> 		
>+		// if the file/folder is part of an archive select the search archives checkbox
>+		if (isPartOfArchive)
>+		{
>+			searchArchivesButton.setSelection(true);
>+		}
>+		
> 		// set the remote folder combo properties if profile name, connection name and folder path are
> 		// not null
> 		if (profileName != null && connectionName != null && folderName != null) {

Flags:

mober.at+eclipse: iplog+

Actions: View | Diff

Attachments on bug 187427: 72742