1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 13:05:22 +02:00

Li Ding (IBM) - [256135] Subsystem not restored in system view tree if subsystem configuration does not support filter

This commit is contained in:
David McKnight 2008-11-21 19:52:17 +00:00
parent d43849229b
commit d278f7ed9a

View file

@ -35,6 +35,7 @@
* David McKnight (IBM) - [244807] System view does not handle restore from cache * David McKnight (IBM) - [244807] System view does not handle restore from cache
* David McKnight (IBM) - [247544] [performance] Restoring Selection on Restart can cause the UI to freeze * David McKnight (IBM) - [247544] [performance] Restoring Selection on Restart can cause the UI to freeze
* Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views * Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views
* Li Ding (IBM) - [256135] Subsystem not restored in system view tree if subsystem configuration does not support filter
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -1320,6 +1321,12 @@ public class SystemViewPart
break; break;
// filter pool or filter (depends on showFilterPools) // filter pool or filter (depends on showFilterPools)
case 3 : case 3 :
if (!(subsystem.getSubSystemConfiguration().supportsFilters())) {
remoteObject = new RemoteObject(token, subsystem, null, null);
break;
}
if (showFilterPools) if (showFilterPools)
{ {
if (subsystem != null) if (subsystem != null)
@ -1364,6 +1371,12 @@ public class SystemViewPart
break; break;
// filter or filter string (depends on showFilterPools) or remote object (depends on showFilterStrings) // filter or filter string (depends on showFilterPools) or remote object (depends on showFilterStrings)
case 4 : case 4 :
if (!(subsystem.getSubSystemConfiguration().supportsFilters())) {
remoteObject = new RemoteObject(token, subsystem, null, null);
break;
}
if (showFilterPools) // definitely a filter if (showFilterPools) // definitely a filter
{ {
index = token.indexOf('='); index = token.indexOf('=');
@ -1400,6 +1413,12 @@ public class SystemViewPart
break; break;
// filter string (depends on showFilterStrings) or remote object // filter string (depends on showFilterStrings) or remote object
case 5 : case 5 :
if (!(subsystem.getSubSystemConfiguration().supportsFilters())) {
remoteObject = new RemoteObject(token, subsystem, null, null);
break;
}
if (showFilterPools && showFilterStrings) // definitely a filter string if (showFilterPools && showFilterStrings) // definitely a filter string
{ {
// at this point we know the parent filter reference as that was parsed in case 4 // at this point we know the parent filter reference as that was parsed in case 4
@ -1420,6 +1439,12 @@ public class SystemViewPart
break; break;
default : // definitely a remote object default : // definitely a remote object
if (!(subsystem.getSubSystemConfiguration().supportsFilters())) {
remoteObject = new RemoteObject(token, subsystem, null, null);
break;
}
if ((subsystem != null) && (fRef != null)) if ((subsystem != null) && (fRef != null))
remoteObject = new RemoteObject(token, subsystem, fRef, fsRef); remoteObject = new RemoteObject(token, subsystem, fRef, fsRef);
} }