mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 17:55:39 +02:00
Code Issues Wiki Activity

[254590] When disconnecting a subsystem with COLLAPSE option, subsystems of other connector services also get collapsed

Browse source
This commit is contained in:
David McKnight 2008-11-07 17:05:51 +00:00
parent 3f04c55147
commit 5a50105f27
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java
View file

@ -57,6 +57,7 @@
* David McKnight (IBM) - [240991] RSE startup creates display on worker thread before workbench. * David McKnight (IBM) - [240991] RSE startup creates display on worker thread before workbench.
* David Dykstal (IBM) - [236516] Bug in user code causes failure in RSE initialization * David Dykstal (IBM) - [236516] Bug in user code causes failure in RSE initialization
* David McKnight (IBM) - [249247] Expand New Connections * David McKnight (IBM) - [249247] Expand New Connections
* David McKnight (IBM( - [254590] When disconnecting a subsystem with COLLAPSE option, subsystems of other connector services also get collapsed
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.core.model; package org.eclipse.rse.internal.core.model;
@ -2319,10 +2320,10 @@ public class SystemRegistry implements ISystemRegistry
*/ */
public void connectedStatusChange(ISubSystem subsystem, boolean connected, boolean wasConnected, boolean collapseTree) public void connectedStatusChange(ISubSystem subsystem, boolean connected, boolean wasConnected, boolean collapseTree)
{ {
//System.out.println("INSIDE CONNECTEDSTATUSCHANGE: "+connected+" vs "+wasConnected);
IHost conn = subsystem.getHost(); IHost conn = subsystem.getHost();
//int eventId = ISystemResourceChangeEvent.EVENT_CHANGE;
//int eventId = ISystemResourceChangeEvent.EVENT_PROPERTY_CHANGE; IConnectorService effectedConnectorService = subsystem.getConnectorService();
if (connected != wasConnected) if (connected != wasConnected)
{ {
int eventId = ISystemResourceChangeEvents.EVENT_ICON_CHANGE; int eventId = ISystemResourceChangeEvents.EVENT_ICON_CHANGE;
@ -2331,13 +2332,15 @@ public class SystemRegistry implements ISystemRegistry
SystemResourceChangeEvent event = new SystemResourceChangeEvent(subsystem, eventId, conn); SystemResourceChangeEvent event = new SystemResourceChangeEvent(subsystem, eventId, conn);
fireEvent(event); fireEvent(event);
// DKM
// fire for each subsystem // fire for each subsystem
ISubSystem[] sses = getSubSystems(conn); ISubSystem[] sses = getSubSystems(conn);
for (int i = 0; i < sses.length; i++) for (int i = 0; i < sses.length; i++)
{ {
ISubSystem ss = sses[i]; ISubSystem ss = sses[i];
if (ss != subsystem)
// only fire the event for subsystems that share the effected connector service
if (ss != subsystem && ss.getConnectorService().equals(effectedConnectorService))
{ {
SystemResourceChangeEvent sevent = new SystemResourceChangeEvent(ss, eventId, conn); SystemResourceChangeEvent sevent = new SystemResourceChangeEvent(ss, eventId, conn);
fireEvent(sevent); fireEvent(sevent);
@ -2364,7 +2367,9 @@ public class SystemRegistry implements ISystemRegistry
for (int i = 0; i < sses.length; i++) for (int i = 0; i < sses.length; i++)
{ {
ISubSystem ss = sses[i]; ISubSystem ss = sses[i];
if (ss != subsystem && !ss.isConnected())
// only fire the event for subsystems that share the effected connector service
if (ss != subsystem && ss.getConnectorService().equals(effectedConnectorService) && !ss.isConnected())
{ {
invalidateFiltersFor(ss); invalidateFiltersFor(ss);
SystemResourceChangeEvent sevent = new SystemResourceChangeEvent(ss, ISystemResourceChangeEvents.EVENT_MUST_COLLAPSE, conn); SystemResourceChangeEvent sevent = new SystemResourceChangeEvent(ss, ISystemResourceChangeEvents.EVENT_MUST_COLLAPSE, conn);