This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit c151735c63ddaed2db93c4c11a7731f23e61ddda Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 2 14:31:27 2016 +0100 ajout d'un try/finally pour etre plus safe --- .../swing/content/home/SelectCruiseUIHandler.java | 39 ++++++++++++---------- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java index 7d48cec..eb2d2d1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java @@ -211,34 +211,39 @@ public class SelectCruiseUIHandler extends AbstractTuttiUIHandler<SelectCruiseUI // disable the actions on the combo during model modifications editProtocolComboBox.putClientProperty(CAN_EDIT, false); - if (model.isProgramFound()) { + try { - // can edit protocol + if (model.isProgramFound()) { - if (editProtocolComboBox.getItemCount() == 2) { + // can edit protocol - editProtocolComboBox.removeAllItems(); - editProtocolComboBox.addItem(getUI().getEditProtocolButton()); - editProtocolComboBox.addItem(getUI().getCloneProtocolButton()); - editProtocolComboBox.addItem(getUI().getExportProtocolButton()); - editProtocolComboBox.addItem(getUI().getDeleteProtocolButton()); + if (editProtocolComboBox.getItemCount() == 2) { - } + editProtocolComboBox.removeAllItems(); + editProtocolComboBox.addItem(getUI().getEditProtocolButton()); + editProtocolComboBox.addItem(getUI().getCloneProtocolButton()); + editProtocolComboBox.addItem(getUI().getExportProtocolButton()); + editProtocolComboBox.addItem(getUI().getDeleteProtocolButton()); - } else { + } + + } else { - // can just export and delete protocol - if (editProtocolComboBox.getItemCount() == 4) { + // can just export and delete protocol + if (editProtocolComboBox.getItemCount() == 4) { - editProtocolComboBox.removeItem(getUI().getEditProtocolButton()); - editProtocolComboBox.removeItem(getUI().getCloneProtocolButton()); + editProtocolComboBox.removeItem(getUI().getEditProtocolButton()); + editProtocolComboBox.removeItem(getUI().getCloneProtocolButton()); + + } } - } + } finally { - //reenable the combo actions - editProtocolComboBox.putClientProperty(CAN_EDIT, true); + //reenable the combo actions + editProtocolComboBox.putClientProperty(CAN_EDIT, true); + } }); diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 85a1a53..238069b 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -703,6 +703,8 @@ tutti.editCps.deleteRow=Supprimer la ligne tutti.editCps.deleteRow.message=Êtes-vous sûr de vouloir supprimer la ligne %s ? tutti.editCps.deleteRow.tip=Supprimer la ligne sélectionnée et la fusionner avec la ligne précédente tutti.editCps.deleteRow.title=Suppression de ligne +tutti.editCps.deleteSpecies= +tutti.editCps.deleteSpecies.tip= tutti.editCps.field.maturity=Maturité tutti.editCps.field.maturity.tip=Prendre en compte la maturité pour l'espèce sélectionnée tutti.editCps.field.species.tip=Espèce -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.