From e7e6ce53791f6fa0bb70597ab4929a2cda001abd Mon Sep 17 00:00:00 2001 From: David Dykstal Date: Wed, 8 Nov 2006 16:44:13 +0000 Subject: [PATCH] Bug 163727 - fixed the retrieval of the default system types --- .../propertypages/SystemTypeFieldEditor.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTypeFieldEditor.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTypeFieldEditor.java index 8b36ed8ba90..91940fb26a3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTypeFieldEditor.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTypeFieldEditor.java @@ -308,30 +308,26 @@ public class SystemTypeFieldEditor extends FieldEditor return sb.toString(); } - private IRSESystemType[] getSystemTypes(boolean defaults) - { + /** + * Retrieve an array of currently known system types. + * @param restoreDefaults restore the default values for the system types + * @return The list of system types known to be in existence + */ + private IRSESystemType[] getSystemTypes(boolean restoreDefaults) { IRSESystemType[] types = RSECorePlugin.getDefault().getRegistry().getSystemTypes(); - ArrayList list = new ArrayList(); - - if (systemTypes == null) { - + if (systemTypes == null || restoreDefaults) { for (int i = 0; i < types.length; i++) { - ISubSystemConfiguration[] configurations = RSEUIPlugin.getTheSystemRegistry().getSubSystemConfigurationsBySystemType(types[i].getName()); - if (configurations != null && configurations.length > 0) { list.add(types[i]); } } } - types = new IRSESystemType[list.size()]; - for (int i = 0; i < list.size(); i++) { - types[i] = (IRSESystemType)(list.get(i)); + types[i] = (IRSESystemType) (list.get(i)); } - return types; }