Author: tchemit Date: 2013-05-23 19:21:24 +0200 (Thu, 23 May 2013) New Revision: 1001 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1001 Log: fixes #2482: [MENSURATIONS] tri du tableau selon les classes de taille Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-23 17:02:06 UTC (rev 1000) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-23 17:21:24 UTC (rev 1001) @@ -149,13 +149,10 @@ public void startEdit() { Preconditions.checkNotNull(tableModel, "No table model assigned."); - - // open frequency dialog - Preconditions.checkNotNull(editRow, "No editRow found."); - if (log.isInfoEnabled()) { - log.info("Will edit frequencies for row: " + rowIndex); + if (log.isDebugEnabled()) { + log.debug("Will edit frequencies for row: " + rowIndex); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); @@ -186,20 +183,20 @@ frequency.add(row); } } - if (log.isInfoEnabled()) { - log.info("Push back " + frequency.size() + - " frequency to batch " + frequencyModel.getBatch()); + if (log.isDebugEnabled()) { + log.debug("Push back " + frequency.size() + + " frequency to batch " + frequencyModel.getBatch()); } // push back to batch editRow.setNumber(null); - } + // set frequencies to the incoming batch editRow.setFrequency(frequency); + // update frequencies total ui.getHandler().updateTotalFromFrequencies(editRow); - } int r = rowIndex; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-23 17:02:06 UTC (rev 1000) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-23 17:21:24 UTC (rev 1001) @@ -566,6 +566,10 @@ // connect model to validator ui.getValidator().setBean(model); + // always sort row by their length + // see http://forge.codelutin.com/issues/2482 + Collections.sort(editFrequency); + model.setRows(editFrequency); model.setLengthStepCaracteristic(lengthStepCaracteristic); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-23 17:02:06 UTC (rev 1000) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-23 17:21:24 UTC (rev 1001) @@ -35,7 +35,6 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; import jaxx.runtime.SwingUtil; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -51,7 +50,6 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.util.Collections; import java.util.List; /** @@ -151,13 +149,10 @@ public void startEdit() { Preconditions.checkNotNull(tableModel, "No table model assigned."); - - // open frequency dialog - Preconditions.checkNotNull(editRow, "No editRow found."); - if (log.isInfoEnabled()) { - log.info("Will edit frequencies for row: " + rowIndex); + if (log.isDebugEnabled()) { + log.debug("Will edit frequencies for row: " + rowIndex); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); @@ -188,22 +183,20 @@ frequency.add(row); } } - if (log.isInfoEnabled()) { - log.info("Push back " + frequency.size() + - " frequency to batch " + frequencyModel.getBatch()); + if (log.isDebugEnabled()) { + log.debug("Push back " + frequency.size() + + " frequency to batch " + frequencyModel.getBatch()); } // push back to batch editRow.setNumber(null); } - // sort frequency by length - Collections.sort(frequency); - + // set frequencies to the incoming batch editRow.setFrequency(frequency); + // update frequencies total ui.getHandler().updateTotalFromFrequencies(editRow); - } int r = rowIndex; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-23 17:02:06 UTC (rev 1000) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-23 17:21:24 UTC (rev 1001) @@ -567,6 +567,10 @@ // connect model to validator ui.getValidator().setBean(model); + // always sort row by their length + // see http://forge.codelutin.com/issues/2482 + Collections.sort(editFrequency); + model.setRows(editFrequency); model.setLengthStepCaracteristic(lengthStepCaracteristic);