From f9da65fbf07bdb5a8f56736ef6cd751a966eb7a0 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Mon, 26 Mar 2007 17:32:53 +0000 Subject: [PATCH] [174299] serivce subsystems need to be identified by the service type, not the service name. In order to retrieve the correct subsystem model object via hashmap, the absolute name of the subsystem must be the same regardless of service implemnetation. --- .../ui/view/SystemViewSubSystemAdapter.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java index cb92b6c93be..8483fd3c9bf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java @@ -25,6 +25,7 @@ import org.eclipse.rse.core.IRSEUserIdConstants; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.IConnectorService; +import org.eclipse.rse.core.subsystems.IServiceSubSystem; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; @@ -148,7 +149,17 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter public String getAbsoluteName(Object element) { ISubSystem ss = (ISubSystem)element; - return ss.getSystemProfileName() + "." + ss.getHostAliasName() + "." + ss.getName(); //$NON-NLS-1$ //$NON-NLS-2$ + + // DKM - using type instead of name + if (ss instanceof IServiceSubSystem) + { + return ss.getSystemProfileName() + "." + ss.getHostAliasName() + "." + ((IServiceSubSystem)ss).getServiceType(); //$NON-NLS-1$ //$NON-NLS-2$ + } + else + { + return ss.getSystemProfileName() + "." + ss.getHostAliasName() + "." + ss.getName(); //$NON-NLS-1$ //$NON-NLS-2$ + } + } /** * Return the type label for this object