branch feature/8056 created (now de48a60)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8056 in repository tutti. See http://git.codelutin.com/tutti.git at de48a60 option pour ne plus mettre de classe de taille par défaut sur les lignes de mensuration si c'est calculé (fixes #8056) This branch includes the following new commits: new de48a60 option pour ne plus mettre de classe de taille par défaut sur les lignes de mensuration si c'est calculé (fixes #8056) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit de48a60d0f51878b567fe2138fb3d175ea54f511 Author: Kevin Morin <morin@codelutin.com> Date: Mon Mar 14 10:50:55 2016 +0100 option pour ne plus mettre de classe de taille par défaut sur les lignes de mensuration si c'est calculé (fixes #8056) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8056 in repository tutti. See http://git.codelutin.com/tutti.git commit de48a60d0f51878b567fe2138fb3d175ea54f511 Author: Kevin Morin <morin@codelutin.com> Date: Mon Mar 14 10:50:55 2016 +0100 option pour ne plus mettre de classe de taille par défaut sur les lignes de mensuration si c'est calculé (fixes #8056) --- .../catches/species/frequency/SpeciesFrequencyTableModel.java | 6 +++--- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java index f544850..3fdaecc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java @@ -95,14 +95,14 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp @Override public SpeciesFrequencyRowModel createNewRow() { - return createNewRow(true); + return createNewRow(true, true); } - public SpeciesFrequencyRowModel createNewRow(boolean attachListeners) { + public SpeciesFrequencyRowModel createNewRow(boolean useDefaultStep, boolean attachListeners) { Float defaultStep = null; int rowCount = getRowCount(); - if (rowCount > 0) { + if (useDefaultStep && rowCount > 0) { SpeciesFrequencyRowModel rowModel = getEntry(rowCount - 1); Float lengthStep = rowModel.getLengthStep(); 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 5744459..fd844e1 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 @@ -747,7 +747,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci for (SpeciesFrequencyRowModel rowModel : frequency) { - SpeciesFrequencyRowModel newRow = tableModel.createNewRow(false); + SpeciesFrequencyRowModel newRow = tableModel.createNewRow(false, false); newRow.setLengthStepCaracteristic(rowModel.getLengthStepCaracteristic()); newRow.setLengthStep(rowModel.getLengthStep()); newRow.setNumber(rowModel.getNumber()); @@ -1554,7 +1554,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } SpeciesFrequencyRowModel row = model.getRowCache().get(size); if (row == null) { - row = getTableModel().createNewRow(); + row = getTableModel().createNewRow(false, true); row.setLengthStep(size); row.setLengthStepCaracteristic(lengthStepCaracteristic); model.getRows().add(row); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm