|
Lines 24-29
Link Here
|
| 24 |
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry |
24 |
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry |
| 25 |
* Martin Oberhuber (Wind River) - [187218] Fix error reporting for connect() |
25 |
* Martin Oberhuber (Wind River) - [187218] Fix error reporting for connect() |
| 26 |
* Xuan Chen (IBM) - [187342] Open in New Window expand failed error when not connected |
26 |
* Xuan Chen (IBM) - [187342] Open in New Window expand failed error when not connected |
|
|
27 |
* Rupen Mardirossian (IBM) - [187713] Modified getFilterReferenceWithAbsoluteName to return proper value |
| 27 |
********************************************************************************/ |
28 |
********************************************************************************/ |
| 28 |
|
29 |
|
| 29 |
package org.eclipse.rse.core.subsystems; |
30 |
package org.eclipse.rse.core.subsystems; |
|
Lines 808-814
Link Here
|
| 808 |
protected Object getFilterReferenceWithAbsoluteName(String key) |
809 |
protected Object getFilterReferenceWithAbsoluteName(String key) |
| 809 |
{ |
810 |
{ |
| 810 |
// figure out if there is a filter |
811 |
// figure out if there is a filter |
| 811 |
String filterID = key; |
812 |
int firstIndexOfStr = key.indexOf("IFileService."); //$NON-NLS-1$ |
|
|
813 |
int firstIndexOfDot = key.indexOf ('.',firstIndexOfStr); |
| 814 |
String filterID = key.substring(firstIndexOfDot+1, key.length()); |
| 812 |
try |
815 |
try |
| 813 |
{ |
816 |
{ |
| 814 |
ISystemFilterPoolReferenceManager filterMgr = getFilterPoolReferenceManager(); |
817 |
ISystemFilterPoolReferenceManager filterMgr = getFilterPoolReferenceManager(); |
|
Lines 821-833
Link Here
|
| 821 |
ISystemFilterPoolManager mgr = parentSubSystemConfiguration.getSystemFilterPoolManager(mgrName); |
824 |
ISystemFilterPoolManager mgr = parentSubSystemConfiguration.getSystemFilterPoolManager(mgrName); |
| 822 |
|
825 |
|
| 823 |
int indexOfDot2 = filterID.indexOf('.', indexOfDot + 1); |
826 |
int indexOfDot2 = filterID.indexOf('.', indexOfDot + 1); |
| 824 |
if (mgr != null && indexOfDot2 > 0) |
827 |
int indexOfDot3 = filterID.indexOf('.', indexOfDot2 + 1); |
|
|
828 |
if (mgr != null && indexOfDot2 > 0 && indexOfDot3 > 0) |
| 825 |
{ |
829 |
{ |
| 826 |
String filterPoolName = filterID.substring(indexOfDot + 1, indexOfDot2); |
830 |
String filterPoolName = filterID.substring(indexOfDot + 1, indexOfDot3); |
| 827 |
|
831 |
|
| 828 |
ISystemFilterPool filterPool = mgr.getSystemFilterPool(filterPoolName); |
832 |
ISystemFilterPool filterPool = mgr.getSystemFilterPool(filterPoolName); |
| 829 |
|
833 |
|
| 830 |
String filterName = filterID.substring(indexOfDot2 + 1, filterID.length()); |
834 |
String filterName = filterID.substring(indexOfDot3 + 1, filterID.length()); |
| 831 |
if (filterPool != null) |
835 |
if (filterPool != null) |
| 832 |
{ |
836 |
{ |
| 833 |
ISystemFilter filter = filterPool.getSystemFilter(filterName); |
837 |
ISystemFilter filter = filterPool.getSystemFilter(filterName); |
