This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 7a69690072a4f3f7c10b6d198510d364c37555ca Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 11:37:51 2016 +0200 [PS] Améliorer l'ergonomie de l'écran de saisie des mensurations de non target (Fixes #7511) --- .../table/impl/seine/TargetSampleUIHandler.java | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 13f5583..3ca2115 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -24,6 +24,11 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.application.swing.ui.content.ContentMode; +import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; +import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; +import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -34,11 +39,6 @@ import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.dto.seine.TargetSampleHelper; import fr.ird.observe.services.service.seine.TargetSampleService; -import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.content.ContentMode; -import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; @@ -135,21 +135,20 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto JComponent requestFocus; + ModeSaisieEchantillonEnum modeSaisieEchantillonEnum; + if (create) { -// if (model.isCreate() && editingRow > 0) { + modeSaisieEchantillonEnum = ModeSaisieEchantillonEnum.byEffectif; if (model.isCreate()) { if (editingRow > 0) { // on recupere l'species de la ligne precedente TargetLengthDto editBean = model.getValueAt(editingRow - 1); species = editBean.getSpecies(); + modeSaisieEchantillonEnum = ModeSaisieEchantillonEnum.valueOf(editBean.getAcquisitionMode()); } - // on passe le mode de saisie en count - ui.getAcquisitionModeGroup().setSelectedValue(null); - ui.getAcquisitionModeGroup().setSelectedValue(ModeSaisieEchantillonEnum.byEffectif); - // on utilise par défaut le code mesure lf ui.getMeasureType().setSelectedItem(null); ui.getMeasureType().setSelectedItem(CodeMesureEnum.lf); @@ -161,14 +160,14 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto requestFocus = ui.getCount(); - // on passe le mode de saisie int acquisitionMode = bean.getAcquisitionMode(); - ModeSaisieEchantillonEnum enumValue = - ModeSaisieEchantillonEnum.valueOf(acquisitionMode); - ui.getAcquisitionModeGroup().setSelectedValue(null); - ui.getAcquisitionModeGroup().setSelectedValue(enumValue); + modeSaisieEchantillonEnum = ModeSaisieEchantillonEnum.valueOf(acquisitionMode); } + + ui.getAcquisitionModeGroup().setSelectedValue(null); + ui.getAcquisitionModeGroup().setSelectedValue(modeSaisieEchantillonEnum); + // on met a jour l'espce ui.getSpecies().setSelectedItem(null); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.