Author: chatellier Date: 2008-12-12 14:19:06 +0000 (Fri, 12 Dec 2008) New Revision: 1661 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Correction de la selection des premier item vides des listes Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java 2008-12-11 17:26:48 UTC (rev 1660) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java 2008-12-12 14:19:06 UTC (rev 1661) @@ -44,31 +44,37 @@ public class Common { - /* + /** * Return regions * - * @param * @return regions */ static public Object[] getRegionItem() { List<String> regionNames = new ArrayList<String>(); + + // FIXME chatellier : Ajout d'une entrée vide pour forcer la sélection + // et que le changement lance un evenement sur la liste regionNames.add(" "); + regionNames.addAll(RegionStorage.getRegionNames()); Object[] result = regionNames.toArray(); return result; } - /* + /** * Return old simulations * - * @param * @return old simulations */ static public Object[] getOldSimulationItem() { - + try { List<String> oldSimul = new ArrayList<String>(); + + // FIXME chatellier : Ajout d'une entrée vide pour forcer la sélection + // et que le changement lance un evenement sur la liste oldSimul.add(" "); + FilterModel<SimulationProperties, String> filterModel; // keep in context list of old simulation names (for filter process) oldSimul.addAll(SimulationStorage.getSimulationNames()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2008-12-11 17:26:48 UTC (rev 1660) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2008-12-12 14:19:06 UTC (rev 1661) @@ -84,25 +84,29 @@ // fieldSimulParamsName.setText(name); // } protected void regionChange(){ - WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); - root.setInfoText(_("isisfish.message.loading.region")); - showMsgBox(getContextValue(SimulAction.class).regionChange(fieldSimulParamsRegion.getSelectedItem().toString())); - refresh(); - root.setInfoText(_("isisfish.message.region.loaded")); + // le premier item est " " pour ne pas avoir de selection par defaut + String selected = fieldSimulParamsRegion.getSelectedItem().toString(); + if(selected != null && !selected.trim().isEmpty()) { + WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); + root.setInfoText(_("isisfish.message.loading.region")); + showMsgBox(getContextValue(SimulAction.class).regionChange(fieldSimulParamsRegion.getSelectedItem().toString())); + refresh(); + root.setInfoText(_("isisfish.message.region.loaded")); + } } public void setSimulationParameter(SimulAction simulAction){ getContextValue(SimulAction.class).setSimulationParameter(simulAction.getSimulationParameter()); } protected void loadOldSimulation(){ - - WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); - root.setInfoText(_("isisfish.message.loading.old.simulation")); String selected = fieldSimulParamsSelect.getSelectedItem().toString(); - if (selected.equals(" ")){ + // le premier item est " " pour ne pas avoir de selection par defaut + if (selected != null && !selected.equals(" ")){ + WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); + root.setInfoText(_("isisfish.message.loading.old.simulation")); showMsgBox(getContextValue(SimulAction.class).loadOldSimulation(selected)); refresh(); + root.setInfoText(_("isisfish.message.old.simulation.loaded")); } - root.setInfoText(_("isisfish.message.old.simulation.loaded")); } protected void addRules(){ getContextValue(SimulAction.class).addRules(fieldSimulParamsMesuresSelect.getSelectedItem().toString()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2008-12-11 17:26:48 UTC (rev 1660) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2008-12-12 14:19:06 UTC (rev 1661) @@ -126,7 +126,7 @@ } catch (Exception eee) { log.error("Can't init SimulationParameter", eee); - return ("Error.xml" + "error" + eee.getMessage()); + return (_("isisfish.simulator.simulaction.init",eee.getMessage())); } return null; } @@ -412,7 +412,11 @@ try { oldSimulNames = new ArrayList<String>(); + + // FIXME chatellier : Ajout d'une entrée vide pour forcer la sélection + // et que le changement lance un evenement sur la liste oldSimulNames.add(" "); + FilterModel<SimulationProperties, String> filterModel; // keep in context list of old simulation names (for filter process) oldSimulNames.addAll(SimulationStorage.getSimulationNames()); Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-12-11 17:26:48 UTC (rev 1660) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-12-12 14:19:06 UTC (rev 1661) @@ -850,6 +850,7 @@ isisfish.simulator.launcher.inprocess=in current process isisfish.simulator.launcher.remote=on remote server isisfish.simulator.launcher.subprocess=in subprocess +isisfish.simulator.simulaction.init=Error during simulation init \: %s isisfish.simulator.subprocess.readoutput.error= isisfish.species.age=age isisfish.species.cee=CEE Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-12-11 17:26:48 UTC (rev 1660) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-12-12 14:19:06 UTC (rev 1661) @@ -298,7 +298,7 @@ isisfish.error.prepare.data=Can't prepare data isisfish.error.prepare.information.simulation=Can't prepare information for simulation isisfish.error.read.simulation=Can't read simulation information %1$s -isisfish.error.read.simulation.parameters=Can't read simulation parameters from file %1$s +isisfish.error.read.simulation.parameters=Impossible de lire les param\u00EAtres du fichier \: %1$s isisfish.error.region.already.exists=Cette r\u00E9gion existe d\u00E9j\u00E0 isisfish.error.region.name.empty=Le nom de la R\u00E9gion est vide isisfish.error.remove.directory=Can't remove directory %1$s @@ -850,6 +850,7 @@ isisfish.simulator.launcher.inprocess=dans le m\u00EAme processus isisfish.simulator.launcher.remote=sur un serveur distant isisfish.simulator.launcher.subprocess=dans un sous processus +isisfish.simulator.simulaction.init=Erreur d'initialisation de la simulation \: %s isisfish.simulator.subprocess.readoutput.error= isisfish.species.age=age isisfish.species.cee=CEE