From e5b5508d2ea7566774838e8db31deaead86726dc Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Wed, 18 Jul 2007 10:54:21 +0000 Subject: [PATCH] [196934] hide disabled system types in remotecdt combo --- releng/org.eclipse.rse.updatesite/site.xml | 2 +- .../org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF | 2 +- .../rse/internal/remotecdt/RemoteCMainTab.java | 12 ++++++++++-- .../org.eclipse.rse.remotecdt-feature/feature.xml | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml index 86e9623b04d..21cfd3087f9 100644 --- a/releng/org.eclipse.rse.updatesite/site.xml +++ b/releng/org.eclipse.rse.updatesite/site.xml @@ -99,7 +99,7 @@ - + diff --git a/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF b/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF index 4184f9930a6..4de723ce88b 100644 --- a/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF +++ b/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.remotecdt;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.1.qualifier Bundle-Activator: org.eclipse.rse.internal.remotecdt.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)", diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java index 22251638fd0..d2392b07fcd 100644 --- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java +++ b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java @@ -8,6 +8,7 @@ * Contributors: * Ewa Matejska (PalmSource) - initial API and implementation * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry + * Martin Oberhuber (Wind River) - [196934] hide disabled system types in remotecdt combo *******************************************************************************/ package org.eclipse.rse.internal.remotecdt; @@ -20,10 +21,12 @@ import org.eclipse.core.runtime.Path; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.jface.window.Window; +import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; +import org.eclipse.rse.ui.RSESystemTypeAdapter; import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -327,8 +330,13 @@ public class RemoteCMainTab extends CMainTab { protected void updateConnectionPulldown() { connectionCombo.removeAll(); IHost[] connections = RSECorePlugin.getTheSystemRegistry().getHostsBySubSystemConfigurationCategory("shells"); //$NON-NLS-1$ - for(int i = 0; i < connections.length; i++) - connectionCombo.add(connections[i].getAliasName()); + for(int i = 0; i < connections.length; i++) { + IRSESystemType sysType = connections[i].getSystemType(); + RSESystemTypeAdapter a = (RSESystemTypeAdapter)sysType.getAdapter(RSESystemTypeAdapter.class); + if (a!=null && a.isEnabled(sysType)) { + connectionCombo.add(connections[i].getAliasName()); + } + } if(connections.length > 0) connectionCombo.select(connections.length - 1); diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml index c6117bcbd17..d2f92636264 100644 --- a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml +++ b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml @@ -2,7 +2,7 @@