This is an automated email from the git hooks/post-receive script. New commit to branch feature/8205 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 5c94f8188751305703a7ac60718a4fd2c4483def Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 5 11:54:16 2016 +0200 on ne peut pas se baser sur le columnmodel pour mettre à jour les identifiants, car on ne garde pas le même ordre et la colonne est déjà supprimée quand on passe dans le listener, donc on ne peut pas savoir quel id supprimer (refs #8205) --- .../IndividualObservationBatchTableModel.java | 40 +++++----------------- 1 file changed, 8 insertions(+), 32 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 3e272c1..964cfa9 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 @@ -29,15 +29,10 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.sampling.SamplingCodePrefix; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.table.CaracteristicColumnIdentifier; -import org.jdesktop.swingx.table.TableColumnExt; import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.TableColumnModelEvent; -import javax.swing.event.TableColumnModelListener; import java.io.Serializable; import java.util.Collection; import java.util.Optional; @@ -116,33 +111,6 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab this.weightUnit = weightUnit; this.defaultCaracteristicsMap = CaracteristicMap.fromCollection(defaultCaracteristicsSet); this.sexCaracteristic = sexCaracteristic; - - columnModel.addColumnModelListener(new TableColumnModelListener() { - - @Override - public void columnAdded(TableColumnModelEvent e) { - TableColumnModelExt columnModel = (TableColumnModelExt) e.getSource(); - TableColumnExt column = columnModel.getColumnExt(e.getToIndex()); - identifiers.add((ColumnIdentifier<IndividualObservationBatchRowModel>) column.getIdentifier()); - } - - @Override - public void columnRemoved(TableColumnModelEvent e) { - TableColumnModelExt columnModel = (TableColumnModelExt) e.getSource(); - TableColumnExt column = columnModel.getColumnExt(e.getFromIndex()); - identifiers.remove(column); - } - - @Override - public void columnMoved(TableColumnModelEvent e) {} - - @Override - public void columnMarginChanged(ChangeEvent e) {} - - @Override - public void columnSelectionChanged(ListSelectionEvent e) {} - }); - setNoneEditableCols(RANK); } @@ -184,6 +152,14 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab } } + public void addMaturityIdentifier(ColumnIdentifier<IndividualObservationBatchRowModel> maturityIdentifer) { + identifiers.add(maturityIdentifer); + } + + public void removeMaturityIdentifier(ColumnIdentifier<IndividualObservationBatchRowModel> maturityIdentifer) { + identifiers.remove(maturityIdentifer); + } + public void setDefaultCaracteristicValues(CaracteristicMap defaultCaracteristicValues) { defaultCaracteristicsMap.replaceAll( (caracteristic, serializable) -> defaultCaracteristicValues.get(caracteristic) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.