|
Lines 20-25
Link Here
|
| 20 |
* 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 |
20 |
* 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 |
| 21 |
* David McKnight (IBM) - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared |
21 |
* David McKnight (IBM) - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared |
| 22 |
* David McKnight (IBM) - [243495] [api] New: Allow file name search in Remote Search to not be case sensitive |
22 |
* David McKnight (IBM) - [243495] [api] New: Allow file name search in Remote Search to not be case sensitive |
|
|
23 |
* David McKnight (IBM) - [279307] NPE when select a filter remove search dialog |
| 23 |
*******************************************************************************/ |
24 |
*******************************************************************************/ |
| 24 |
|
25 |
|
| 25 |
package org.eclipse.rse.internal.files.ui.search; |
26 |
package org.eclipse.rse.internal.files.ui.search; |
|
Lines 42-50
Link Here
|
| 42 |
import org.eclipse.osgi.util.NLS; |
43 |
import org.eclipse.osgi.util.NLS; |
| 43 |
import org.eclipse.rse.core.IRSESystemType; |
44 |
import org.eclipse.rse.core.IRSESystemType; |
| 44 |
import org.eclipse.rse.core.RSECorePlugin; |
45 |
import org.eclipse.rse.core.RSECorePlugin; |
|
|
46 |
import org.eclipse.rse.core.filters.ISystemFilterReference; |
| 45 |
import org.eclipse.rse.core.model.IHost; |
47 |
import org.eclipse.rse.core.model.IHost; |
| 46 |
import org.eclipse.rse.core.model.ISystemProfile; |
48 |
import org.eclipse.rse.core.model.ISystemProfile; |
| 47 |
import org.eclipse.rse.core.model.ISystemRegistry; |
49 |
import org.eclipse.rse.core.model.ISystemRegistry; |
|
|
50 |
import org.eclipse.rse.core.subsystems.ISubSystem; |
| 48 |
import org.eclipse.rse.internal.files.ui.Activator; |
51 |
import org.eclipse.rse.internal.files.ui.Activator; |
| 49 |
import org.eclipse.rse.internal.files.ui.FileResources; |
52 |
import org.eclipse.rse.internal.files.ui.FileResources; |
| 50 |
import org.eclipse.rse.internal.files.ui.ISystemFileConstants; |
53 |
import org.eclipse.rse.internal.files.ui.ISystemFileConstants; |
|
Lines 69-74
Link Here
|
| 69 |
import org.eclipse.rse.ui.SystemBasePlugin; |
72 |
import org.eclipse.rse.ui.SystemBasePlugin; |
| 70 |
import org.eclipse.rse.ui.SystemWidgetHelpers; |
73 |
import org.eclipse.rse.ui.SystemWidgetHelpers; |
| 71 |
import org.eclipse.rse.ui.messages.SystemMessageDialog; |
74 |
import org.eclipse.rse.ui.messages.SystemMessageDialog; |
|
|
75 |
import org.eclipse.rse.ui.view.ISystemViewElementAdapter; |
| 72 |
import org.eclipse.search.internal.ui.SearchMessages; |
76 |
import org.eclipse.search.internal.ui.SearchMessages; |
| 73 |
import org.eclipse.search.ui.ISearchPage; |
77 |
import org.eclipse.search.ui.ISearchPage; |
| 74 |
import org.eclipse.search.ui.ISearchPageContainer; |
78 |
import org.eclipse.search.ui.ISearchPageContainer; |
|
Lines 453-458
Link Here
|
| 453 |
if (!selectFolderAction.wasCancelled()) { |
457 |
if (!selectFolderAction.wasCancelled()) { |
| 454 |
// store remote path |
458 |
// store remote path |
| 455 |
IRemoteFile remoteFile = selectFolderAction.getSelectedFolder(); |
459 |
IRemoteFile remoteFile = selectFolderAction.getSelectedFolder(); |
|
|
460 |
if (remoteFile == null){ |
| 461 |
// could have selected a filter reference |
| 462 |
Object value = selectFolderAction.getValue(); |
| 463 |
if (value instanceof ISystemFilterReference){ |
| 464 |
ISystemFilterReference fref = (ISystemFilterReference)value; |
| 465 |
ISubSystem ss = fref.getSubSystem(); |
| 466 |
|
| 467 |
// target for filter should give the most relevant folder |
| 468 |
Object target = ss.getTargetForFilter(fref); |
| 469 |
if (target instanceof IRemoteFile){ |
| 470 |
remoteFile = (IRemoteFile)target; |
| 471 |
} |
| 472 |
} |
| 473 |
|
| 474 |
} |
| 456 |
String folderPath = remoteFile.getAbsolutePath(); |
475 |
String folderPath = remoteFile.getAbsolutePath(); |
| 457 |
|
476 |
|
| 458 |
// store connection and profile |
477 |
// store connection and profile |
