|
Lines 14-19
Link Here
|
| 14 |
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry |
14 |
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry |
| 15 |
* Kevin Doyle (IBM) - [182024] Folder field only initialized if selection supports search |
15 |
* Kevin Doyle (IBM) - [182024] Folder field only initialized if selection supports search |
| 16 |
* Kevin Doyle (IBM) - [189430] Limited System Types displayed in Folder Dialog |
16 |
* Kevin Doyle (IBM) - [189430] Limited System Types displayed in Folder Dialog |
|
|
17 |
* Kevin Doyle (IBM) - [187427] Selecting an Archive will check Search Archives checkbox |
| 17 |
********************************************************************************/ |
18 |
********************************************************************************/ |
| 18 |
|
19 |
|
| 19 |
package org.eclipse.rse.internal.files.ui.search; |
20 |
package org.eclipse.rse.internal.files.ui.search; |
|
Lines 41-46
Link Here
|
| 41 |
import org.eclipse.rse.internal.ui.view.search.SystemSearchUI; |
42 |
import org.eclipse.rse.internal.ui.view.search.SystemSearchUI; |
| 42 |
import org.eclipse.rse.internal.ui.view.search.SystemSearchViewPart; |
43 |
import org.eclipse.rse.internal.ui.view.search.SystemSearchViewPart; |
| 43 |
import org.eclipse.rse.services.clientserver.SystemSearchString; |
44 |
import org.eclipse.rse.services.clientserver.SystemSearchString; |
|
|
45 |
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager; |
| 44 |
import org.eclipse.rse.services.clientserver.messages.SystemMessage; |
46 |
import org.eclipse.rse.services.clientserver.messages.SystemMessage; |
| 45 |
import org.eclipse.rse.services.clientserver.messages.SystemMessageException; |
47 |
import org.eclipse.rse.services.clientserver.messages.SystemMessageException; |
| 46 |
import org.eclipse.rse.services.clientserver.search.SystemSearchUtil; |
48 |
import org.eclipse.rse.services.clientserver.search.SystemSearchUtil; |
|
Lines 442-447
Link Here
|
| 442 |
String connectionName = conn.getAliasName(); |
444 |
String connectionName = conn.getAliasName(); |
| 443 |
|
445 |
|
| 444 |
setFolderText(profileName, connectionName, folderPath); |
446 |
setFolderText(profileName, connectionName, folderPath); |
|
|
447 |
|
| 448 |
String absPath = remoteFile.getAbsolutePath(); |
| 449 |
boolean supportsSearch = remoteFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsSearch(); |
| 450 |
boolean supportsArchiveManagement = remoteFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement(); |
| 451 |
// if the file/folder is part of an archive select the search archives checkbox |
| 452 |
if (supportsSearch && supportsArchiveManagement && (remoteFile.isArchive() || (absPath.indexOf(ArchiveHandlerManager.VIRTUAL_SEPARATOR) > 0))) |
| 453 |
searchArchivesButton.setSelection(true); |
| 445 |
} |
454 |
} |
| 446 |
} |
455 |
} |
| 447 |
|
456 |
|
|
Lines 887-892
Link Here
|
| 887 |
String profileName = null; |
896 |
String profileName = null; |
| 888 |
String connectionName = null; |
897 |
String connectionName = null; |
| 889 |
String folderName = null; |
898 |
String folderName = null; |
|
|
899 |
boolean isPartOfArchive = false; |
| 890 |
|
900 |
|
| 891 |
// if selection is not empty, we handle structured selection or text selection |
901 |
// if selection is not empty, we handle structured selection or text selection |
| 892 |
if (selection != null && !selection.isEmpty()) { |
902 |
if (selection != null && !selection.isEmpty()) { |
|
Lines 915-922
Link Here
|
| 915 |
IHost conn = remoteFile.getSystemConnection(); |
925 |
IHost conn = remoteFile.getSystemConnection(); |
| 916 |
profileName = conn.getSystemProfileName(); |
926 |
profileName = conn.getSystemProfileName(); |
| 917 |
connectionName = conn.getAliasName(); |
927 |
connectionName = conn.getAliasName(); |
| 918 |
folderName = remoteFile.getAbsolutePath(); |
928 |
folderName = remoteFile.getAbsolutePath(); |
| 919 |
} |
929 |
} |
|
|
930 |
String absPath = remoteFile.getAbsolutePath(); |
| 931 |
// Determine if we support search + archives and selection is part of an archive |
| 932 |
isPartOfArchive = supportsSearch && supportsArchiveManagement && (remoteFile.isArchive() || (absPath.indexOf(ArchiveHandlerManager.VIRTUAL_SEPARATOR) > 0)); |
| 920 |
} |
933 |
} |
| 921 |
} |
934 |
} |
| 922 |
// otherwise, if it is a text selection |
935 |
// otherwise, if it is a text selection |
|
Lines 946-951
Link Here
|
| 946 |
// set the file name |
959 |
// set the file name |
| 947 |
fileNameEditor.setFileNamesText(fileName); |
960 |
fileNameEditor.setFileNamesText(fileName); |
| 948 |
|
961 |
|
|
|
962 |
// if the file/folder is part of an archive select the search archives checkbox |
| 963 |
if (isPartOfArchive) |
| 964 |
{ |
| 965 |
searchArchivesButton.setSelection(true); |
| 966 |
} |
| 967 |
|
| 949 |
// set the remote folder combo properties if profile name, connection name and folder path are |
968 |
// set the remote folder combo properties if profile name, connection name and folder path are |
| 950 |
// not null |
969 |
// not null |
| 951 |
if (profileName != null && connectionName != null && folderName != null) { |
970 |
if (profileName != null && connectionName != null && folderName != null) { |
