From d3ba9e3301d8452e9ccddf74398b40d2afad18ab Mon Sep 17 00:00:00 2001 From: Uwe Stieber Date: Tue, 27 Mar 2007 13:30:21 +0000 Subject: [PATCH] [fix] [preferences] Default system type combo does show ids instead of UI labels --- .../src/org/eclipse/rse/internal/core/RSESystemType.java | 6 ++++-- .../rse/ui/propertypages/RemoteSystemsPreferencePage.java | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/RSESystemType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/RSESystemType.java index a4712b7e3ba..bdb977b8bd3 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/RSESystemType.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/RSESystemType.java @@ -113,8 +113,10 @@ public class RSESystemType extends PlatformObject implements IRSESystemType { * @see org.eclipse.rse.core.IRSESystemType#getLabel() */ public String getLabel() { - // fallback to the id if the label should be null. - if (label == null) return getId(); + // For default RSE system types, the UI label is equal to the + // name. Therefor, fallback to the name if the label is not + // explicitly set. + if (label == null) return getName(); return label; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/RemoteSystemsPreferencePage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/RemoteSystemsPreferencePage.java index 41518815a44..dbba3b42fea 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/RemoteSystemsPreferencePage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/RemoteSystemsPreferencePage.java @@ -95,15 +95,15 @@ public class RemoteSystemsPreferencePage { IPreferenceStore coreStore = new PreferencesMapper(RSECorePlugin.getDefault().getPluginPreferences()); - List systemTypeNames = new ArrayList(); + List systemTypeLabels = new ArrayList(); IRSESystemType[] systemTypes = RSECorePlugin.getDefault().getRegistry().getSystemTypes(); - for (int i = 0; i < systemTypes.length; i++) systemTypeNames.add(systemTypes[i].getName()); + for (int i = 0; i < systemTypes.length; i++) systemTypeLabels.add(systemTypes[i].getLabel()); // DEFAULT SYSTEM TYPE SystemComboBoxFieldEditor systemTypeEditor = new SystemComboBoxFieldEditor( IRSEPreferenceNames.SYSTEMTYPE, SystemResources.RESID_PREF_SYSTEMTYPE_PREFIX_LABEL, - (String[])systemTypeNames.toArray(new String[systemTypeNames.size()]), + (String[])systemTypeLabels.toArray(new String[systemTypeLabels.size()]), true, // readonly getFieldEditorParent() );