This is an automated email from the git hooks/post-receive script. New commit to branch feature/ecran_obs_individuelles in repository tutti. See http://git.codelutin.com/tutti.git commit 8f3eab7b03b9fa919626ad4fd36e3e1f8b31cccf Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 1 14:57:43 2016 +0100 correction de l'incrément des lignes quand on quitte et revient sur l'ecran des mensurations (refs #8019) --- .../IndividualObservationBatchTableModel.java | 2 +- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java index 22274f9..2235ae5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java @@ -82,7 +82,7 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab public IndividualObservationBatchTableModel(WeightUnit weightUnit, TableColumnModelExt columnModel) { - super(columnModel, true, true); + super(columnModel, true, false); this.weightUnit = weightUnit; setNoneEditableCols(RANK); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index e7989b2..bb4b4b5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -605,14 +605,14 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci model.setMaxStep(null); model.setRtp(null); - ((IndividualObservationBatchTableModel) ui.getObsTable().getModel()).setSpecies(speciesBatch.getSpecies()); + IndividualObservationBatchTableModel obsTableModel = (IndividualObservationBatchTableModel) ui.getObsTable().getModel(); + obsTableModel.setSpecies(speciesBatch.getSpecies()); ArrayList<IndividualObservationBatchRowModel> individualObservationRows = new ArrayList<>(); - IndividualObservationBatchRowModel emptyRow = - ((IndividualObservationBatchTableModel) ui.getObsTable().getModel()).createNewRow(); - emptyRow.addPropertyChangeListener(obsChangedListener); - individualObservationRows.add(emptyRow); model.setIndividualObservationRows(individualObservationRows); + IndividualObservationBatchRowModel emptyRow = obsTableModel.createNewRow(); + emptyRow.addPropertyChangeListener(obsChangedListener); + obsTableModel.addNewRow(emptyRow); frequencyEditor = editor; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.