mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-14 20:45:22 +02:00
Code Issues Wiki Activity

[165674] Sort subsystem configurations by Id rather than name

Browse source
This commit is contained in:
Martin Oberhuber 2007-07-23 14:55:17 +00:00
parent a864b9bfc3
commit e9ee543d10
2 changed files with 22 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java
View file

@ -97,12 +97,12 @@ public interface ISystemRegistry extends ISchedulingRule, IAdaptable, ISystemVie
public ISubSystemConfiguration getSubSystemConfiguration(String id); public ISubSystemConfiguration getSubSystemConfiguration(String id);
/** /**
* Return all subsystem factories which support the given system type. * Return all subsystem configurations which support the given system type.
* If the type is null, returns all. * If the type is null, returns all.
* @param systemType system type to filter * @param systemType system type to filter
* @param filterDuplicateServiceSubSystemFactories set false by default * @param filterDuplicateServiceSubSystemConfigurations set false by default
*/ */
public ISubSystemConfiguration[] getSubSystemConfigurationsBySystemType(IRSESystemType systemType, boolean filterDuplicateServiceSubSystemFactories); public ISubSystemConfiguration[] getSubSystemConfigurationsBySystemType(IRSESystemType systemType, boolean filterDuplicateServiceSubSystemConfigurations);
// ---------------------------------- // ----------------------------------
// SYSTEMVIEWINPUTPROVIDER METHODS... // SYSTEMVIEWINPUTPROVIDER METHODS...

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

@ -33,11 +33,13 @@
* Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core
* Xuan Chen (IBM) - [194838] Move the code for comparing two objects by absolute name to a common location * Xuan Chen (IBM) - [194838] Move the code for comparing two objects by absolute name to a common location
* David McKnight (IBM) - [165674] Sort subsystem configurations to be in deterministic order * David McKnight (IBM) - [165674] Sort subsystem configurations to be in deterministic order
* Martin Oberhuber (Wind River) - [165674] Sort subsystem configurations by Id rather than name
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.ui.internal.model; package org.eclipse.rse.ui.internal.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
@ -258,9 +260,19 @@ public class SystemRegistry implements ISystemRegistry
*/ */
public void setSubSystemConfigurationProxies(ISubSystemConfigurationProxy[] proxies) public void setSubSystemConfigurationProxies(ISubSystemConfigurationProxy[] proxies)
{ {
subsystemConfigurationProxies = proxies; //[165674]: Sort proxies by ID in order to get deterministic results
//for (int idx=0; idx<proxies.length; idx++) //on all getSubSystemConfiguration*() queries
// proxies[idx].setLogFile(logFile); ISubSystemConfigurationProxy[] newProxies = (ISubSystemConfigurationProxy[])proxies.clone();
Arrays.sort(newProxies, new Comparator(){
public int compare(Object o1, Object o2) {
String t1 = ((ISubSystemConfigurationProxy) o1).getId();
String t2 = ((ISubSystemConfigurationProxy) o2).getId();
return t1.compareTo(t2);
}
});
//for (int idx=0; idx<newProxies.length; idx++)
// newProxies[idx].setLogFile(logFile);
subsystemConfigurationProxies = newProxies;
} }
/** /**
* Public method to retrieve list of subsystem factory proxies registered by extension points. * Public method to retrieve list of subsystem factory proxies registered by extension points.
@ -308,10 +320,9 @@ public class SystemRegistry implements ISystemRegistry
/** /*
* Return all subsystem factories which support the given system type. * (non-Javadoc)
* If the type is null, returns all. * @see org.eclipse.rse.core.model.ISystemRegistry#getSubSystemConfigurationsBySystemType(org.eclipse.rse.core.IRSESystemType, boolean)
*
*/ */
public ISubSystemConfiguration[] getSubSystemConfigurationsBySystemType(IRSESystemType systemType, boolean filterDuplicateServiceSubSystemFactories) public ISubSystemConfiguration[] getSubSystemConfigurationsBySystemType(IRSESystemType systemType, boolean filterDuplicateServiceSubSystemFactories)
{ {
@ -360,28 +371,7 @@ public class SystemRegistry implements ISystemRegistry
v.addElement(ssFactory); v.addElement(ssFactory);
} }
else // for 165674 - fix the order to be deterministic
{
// replace with this one if this is first alphabetically
// find the current one
for (int i = 0; i < v.size(); i++)
{
if (v.get(i) instanceof IServiceSubSystemConfiguration)
{
IServiceSubSystemConfiguration addedConfig = (IServiceSubSystemConfiguration)v.get(i);
if (addedConfig.getServiceType() == serviceType)
{
if (serviceFactory.getName().compareTo(addedConfig.getName()) <= 0)
{
v.remove(addedConfig);
v.add(serviceFactory);
} }
}
}
}
}
}
else else
{ {
v.addElement(ssFactory); v.addElement(ssFactory);
@ -390,50 +380,10 @@ public class SystemRegistry implements ISystemRegistry
} }
} }
} }
ISubSystemConfiguration[] factories = (ISubSystemConfiguration[])v.toArray(new ISubSystemConfiguration[v.size()]);
v = sortConfigurations(v);
ISubSystemConfiguration[] factories = new ISubSystemConfiguration[v.size()];
for (int idx = 0; idx < v.size(); idx++)
factories[idx] = (ISubSystemConfiguration) v.elementAt(idx);
return factories; return factories;
} }
private Vector sortConfigurations(Vector v)
{
Vector sorted = new Vector(v.size());
while (v.size() > 0)
{
ISubSystemConfiguration first = firstConfiguration(v);
sorted.add(first);
v.remove(first);
}
return sorted;
}
private ISubSystemConfiguration firstConfiguration(Vector v)
{
ISubSystemConfiguration first = null;
for (int i = 0; i < v.size(); i++)
{
ISubSystemConfiguration next = (ISubSystemConfiguration)v.get(i);
if (first == null)
{
first = next;
}
else
{
String name1 = first.getName();
String name2 = next.getName();
if (name2.compareTo(name1) <= 0)
{
first = next;
}
}
}
return first;
}
// ---------------------------- // ----------------------------
// USER PREFERENCE METHODS... // USER PREFERENCE METHODS...