mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-23 08:13:50 +02:00
Code Issues Wiki Activity

[183134] getLocalHost() does not return Local - applied patch from Tobias Schwarz. This checkin overrides [170932] in order to provide a stable I-build

Browse source
This commit is contained in:
Martin Oberhuber 2007-04-19 09:21:35 +00:00
parent 5be124e200
commit 9ad9c16782
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRegistry.java
View file

@ -17,6 +17,7 @@
* David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies * David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies
* Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType
* David Dykstal (IBM) - 142806: refactoring persistence framework * David Dykstal (IBM) - 142806: refactoring persistence framework
* Tobias Schwarz (Wind River) - [183134] getLocalHost() does not return Local
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.model; package org.eclipse.rse.model;
@ -38,6 +39,7 @@ import org.eclipse.rse.core.IRSEUserIdConstants;
import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilter;
import org.eclipse.rse.core.filters.ISystemFilterPool;
import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager; import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.filters.ISystemFilterReference;
import org.eclipse.rse.core.filters.ISystemFilterStartHere; import org.eclipse.rse.core.filters.ISystemFilterStartHere;
@ -64,13 +66,14 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy; import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy;
import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.internal.core.filters.SystemFilterPool;
import org.eclipse.rse.internal.core.filters.SystemFilterStartHere; import org.eclipse.rse.internal.core.filters.SystemFilterStartHere;
import org.eclipse.rse.internal.core.model.SystemProfileManager;
import org.eclipse.rse.internal.model.SystemHostPool; import org.eclipse.rse.internal.model.SystemHostPool;
import org.eclipse.rse.internal.model.SystemModelChangeEvent; import org.eclipse.rse.internal.model.SystemModelChangeEvent;
import org.eclipse.rse.internal.model.SystemModelChangeEventManager; import org.eclipse.rse.internal.model.SystemModelChangeEventManager;
import org.eclipse.rse.internal.model.SystemPostableEventNotifier; import org.eclipse.rse.internal.model.SystemPostableEventNotifier;
import org.eclipse.rse.internal.model.SystemPreferenceChangeManager; import org.eclipse.rse.internal.model.SystemPreferenceChangeManager;
import org.eclipse.rse.internal.model.SystemProfileManager;
import org.eclipse.rse.internal.model.SystemRemoteChangeEventManager; import org.eclipse.rse.internal.model.SystemRemoteChangeEventManager;
import org.eclipse.rse.internal.model.SystemResourceChangeManager; import org.eclipse.rse.internal.model.SystemResourceChangeManager;
import org.eclipse.rse.internal.model.SystemScratchpad; import org.eclipse.rse.internal.model.SystemScratchpad;
@ -761,7 +764,7 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven
*/ */
public ISystemProfileManager getSystemProfileManager() public ISystemProfileManager getSystemProfileManager()
{ {
return SystemProfileManager.getDefault(); return SystemProfileManager.getSystemProfileManager();
} }
/** /**
@ -792,14 +795,12 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven
{ {
return getSystemProfileManager().getSystemProfileNames(); return getSystemProfileManager().getSystemProfileNames();
} }
/** /**
* Return all defined profile names as a vector * Return all defined profile names as a vector
*/ */
public Vector getAllSystemProfileNamesVector() public Vector getAllSystemProfileNamesVector()
{ {
Vector v = getSystemProfileManager().getSystemProfileNamesVector(); return getSystemProfileManager().getSystemProfileNamesVector();
return v;
} }
/** /**
@ -1793,7 +1794,7 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven
Vector v = new Vector(); Vector v = new Vector();
for (int idx = 0; idx < connections.length; idx++) for (int idx = 0; idx < connections.length; idx++)
{ {
if (connections[idx].getSystemType().equals(systemType)) if (systemType.equals(connections[idx].getSystemType().getName()))
v.addElement(connections[idx]); v.addElement(connections[idx]);
} }
IHost[] conns = new IHost[v.size()]; IHost[] conns = new IHost[v.size()];
@ -2841,6 +2842,8 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven
*/ */
public void disconnectAllSubSystems(IHost conn) public void disconnectAllSubSystems(IHost conn)
{ {
// FIXME - save profile
save();
ISubSystem[] subsystems = getSubSystemsLazily(conn); ISubSystem[] subsystems = getSubSystemsLazily(conn);
if (subsystems == null) if (subsystems == null)
@ -3343,7 +3346,8 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven
*/ */
public boolean save() public boolean save()
{ {
return RSEUIPlugin.getThePersistenceManager().commitProfiles(); ISystemProfileManager profileManager = getSystemProfileManager();
return RSEUIPlugin.getThePersistenceManager().commit(profileManager);
} }
/** /**
@ -3352,7 +3356,7 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven
*/ */
public boolean saveHostPool(ISystemHostPool pool) public boolean saveHostPool(ISystemHostPool pool)
{ {
return pool.commit(); return RSEUIPlugin.getThePersistenceManager().commit(pool);
} }
/** /**
@ -3410,4 +3414,9 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven
return SystemFilterStartHere.getDefault(); return SystemFilterStartHere.getDefault();
} }
public ISystemFilterPool getSystemFilterPool()
{
return SystemFilterPool.getDefault();
}
}//SystemRegistryImpl }//SystemRegistryImpl