This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 316f3204009d5c73a8d8b65c93d0523469f641e6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 11 07:54:08 2015 +0200 Utilisation de la taille de la liste pour le réagencement des ids de la palangre et non pas de la taille du modèle de table (refs #7328) --- .../LonglineCompositionTableModelSupport.java | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineCompositionTableModelSupport.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineCompositionTableModelSupport.java index f248f57..5817a98 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineCompositionTableModelSupport.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineCompositionTableModelSupport.java @@ -24,6 +24,8 @@ package fr.ird.observe.ui.content.impl.longline; import fr.ird.observe.entities.longline.LonglineCompositionEntity; import fr.ird.observe.ui.util.table.EditableTableModelSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; import java.util.List; @@ -36,6 +38,9 @@ import java.util.List; */ public abstract class LonglineCompositionTableModelSupport<E extends TopiaEntity & LonglineCompositionEntity> extends EditableTableModelSupport<E> { + /** Logger. */ + private static final Log log = LogFactory.getLog(LonglineCompositionTableModelSupport.class); + private static final long serialVersionUID = 1L; private final LonglineDetailCompositionUIModel model; @@ -74,12 +79,21 @@ public abstract class LonglineCompositionTableModelSupport<E extends TopiaEntity boolean generateHaulingIds = isGenerateHaulingIds(); boolean haulingdirectionSameAsSettings = model.isHaulingdirectionSameAsSettings(); - int rowCount = getRowCount(); + int dataSize = data.size(); + + if (log.isInfoEnabled()) { + log.info("Will rearrange ids for " + dataSize + " data on " + this); + log.info("generateHaulingIds ? " + generateHaulingIds); + log.info("haulingdirectionSameAsSettings ? " + haulingdirectionSameAsSettings); + } int index = 1; for (E e : data) { + if (log.isInfoEnabled()) { + log.info("SettingIdentifier : " + index); + } e.setSettingIdentifier(index); if (generateHaulingIds) { @@ -89,9 +103,12 @@ public abstract class LonglineCompositionTableModelSupport<E extends TopiaEntity if (haulingdirectionSameAsSettings) { haulingId = index; } else { - haulingId = rowCount - index + 1; + haulingId = dataSize - index + 1; } + if (log.isInfoEnabled()) { + log.info("HaulingIdentifier : " + haulingId); + } e.setHaulingIdentifier(haulingId); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.