|
Lines 33-38
Link Here
|
| 33 |
* David Dykstal (IBM) - [216858] Need the ability to Import/Export RSE connections for sharing |
33 |
* David Dykstal (IBM) - [216858] Need the ability to Import/Export RSE connections for sharing |
| 34 |
* Kevin Doyle (IBM) - [186769] Enable Contributions to Drop Down menu of Remote Systems view -> Preferences |
34 |
* Kevin Doyle (IBM) - [186769] Enable Contributions to Drop Down menu of Remote Systems view -> Preferences |
| 35 |
* David McKnight (IBM) - [244807] System view does not handle restore from cache |
35 |
* David McKnight (IBM) - [244807] System view does not handle restore from cache |
|
|
36 |
* Li Ding (IBM) - [256135] Subsystem not restored in system view tree if subsystem configuration does not support filter |
| 36 |
*******************************************************************************/ |
37 |
*******************************************************************************/ |
| 37 |
|
38 |
|
| 38 |
package org.eclipse.rse.internal.ui.view; |
39 |
package org.eclipse.rse.internal.ui.view; |
|
Lines 1316-1321
Link Here
|
| 1316 |
break; |
1317 |
break; |
| 1317 |
// filter pool or filter (depends on showFilterPools) |
1318 |
// filter pool or filter (depends on showFilterPools) |
| 1318 |
case 3 : |
1319 |
case 3 : |
|
|
1320 |
|
| 1321 |
if (!(subsystem.getSubSystemConfiguration().supportsFilters())) { |
| 1322 |
remoteObject = new RemoteObject(token, subsystem, null, null); |
| 1323 |
break; |
| 1324 |
} |
| 1325 |
|
| 1319 |
if (showFilterPools) |
1326 |
if (showFilterPools) |
| 1320 |
{ |
1327 |
{ |
| 1321 |
if (subsystem != null) |
1328 |
if (subsystem != null) |
|
Lines 1360-1365
Link Here
|
| 1360 |
break; |
1367 |
break; |
| 1361 |
// filter or filter string (depends on showFilterPools) or remote object (depends on showFilterStrings) |
1368 |
// filter or filter string (depends on showFilterPools) or remote object (depends on showFilterStrings) |
| 1362 |
case 4 : |
1369 |
case 4 : |
|
|
1370 |
|
| 1371 |
if (!(subsystem.getSubSystemConfiguration().supportsFilters())) { |
| 1372 |
remoteObject = new RemoteObject(token, subsystem, null, null); |
| 1373 |
break; |
| 1374 |
} |
| 1375 |
|
| 1363 |
if (showFilterPools) // definitely a filter |
1376 |
if (showFilterPools) // definitely a filter |
| 1364 |
{ |
1377 |
{ |
| 1365 |
index = token.indexOf('='); |
1378 |
index = token.indexOf('='); |
|
Lines 1396-1401
Link Here
|
| 1396 |
break; |
1409 |
break; |
| 1397 |
// filter string (depends on showFilterStrings) or remote object |
1410 |
// filter string (depends on showFilterStrings) or remote object |
| 1398 |
case 5 : |
1411 |
case 5 : |
|
|
1412 |
|
| 1413 |
if (!(subsystem.getSubSystemConfiguration().supportsFilters())) { |
| 1414 |
remoteObject = new RemoteObject(token, subsystem, null, null); |
| 1415 |
break; |
| 1416 |
} |
| 1417 |
|
| 1399 |
if (showFilterPools && showFilterStrings) // definitely a filter string |
1418 |
if (showFilterPools && showFilterStrings) // definitely a filter string |
| 1400 |
{ |
1419 |
{ |
| 1401 |
// at this point we know the parent filter reference as that was parsed in case 4 |
1420 |
// at this point we know the parent filter reference as that was parsed in case 4 |
|
Lines 1416-1421
Link Here
|
| 1416 |
|
1435 |
|
| 1417 |
break; |
1436 |
break; |
| 1418 |
default : // definitely a remote object |
1437 |
default : // definitely a remote object |
|
|
1438 |
|
| 1439 |
if (!(subsystem.getSubSystemConfiguration().supportsFilters())) { |
| 1440 |
remoteObject = new RemoteObject(token, subsystem, null, null); |
| 1441 |
break; |
| 1442 |
} |
| 1443 |
|
| 1419 |
if ((subsystem != null) && (fRef != null)) |
1444 |
if ((subsystem != null) && (fRef != null)) |
| 1420 |
remoteObject = new RemoteObject(token, subsystem, fRef, fsRef); |
1445 |
remoteObject = new RemoteObject(token, subsystem, fRef, fsRef); |
| 1421 |
} |
1446 |
} |
