Author: chatellier Date: 2008-11-28 16:17:06 +0000 (Fri, 28 Nov 2008) New Revision: 1632 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Add simalutor name sort (to set "local" always default first choice in list) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2008-11-28 16:14:57 UTC (rev 1631) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2008-11-28 16:17:06 UTC (rev 1632) @@ -44,6 +44,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -131,7 +132,7 @@ /** La queue contenant toutes les simulations a faire */ protected SimulationQueue queue = new SimulationQueue(); - /** Contient les identifiants des simulations presentes dans {@ link #jobs}*/ + /** Contient les identifiants des simulations presentes dans {@link #jobs}*/ protected Set<String> idJobs = new HashSet<String>(); /** La liste des jobs existant (queue + job demarre) */ protected Set<SimulationJob> jobs = new TreeSet<SimulationJob>(); @@ -145,7 +146,14 @@ protected SimulationService() { // on cree un executor par type SimulatorLauncher Properties prop = IsisFish.config.getOptionStartsWith(SIMULATION_LAUNCHER); - for (String key : prop.stringPropertyNames()) { + + // sort simulation names by... names + // this solve "local" "sub", "remote" order + // default "local" is in first in UI. + List<String> simulationKeys = new ArrayList<String>(prop.stringPropertyNames()); + Collections.sort(simulationKeys); + + for (String key : simulationKeys) { String value = prop.getProperty(key); try { SimulatorLauncher sl = (SimulatorLauncher) ObjectUtil.newInstance(value);