This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit bac64afb829011015fdb66554e1f0ed5a4e3351b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 10:21:42 2016 +0200 Fin du ménage même s'il reste encore des choses à revoir... --- .../IndividualObservationBatchTableHandler.java | 43 +++------ .../IndividualObservationBatchTableModel.java | 8 ++ .../IndividualObservationBatchUIModel.java | 8 ++ .../frequency/SpeciesFrequencyRowModel.java | 4 + .../frequency/SpeciesFrequencyUIHandler.java | 40 ++------ .../species/frequency/SpeciesFrequencyUIModel.java | 103 ++++++++------------- .../actions/ApplySpeciesFrequencyRafaleAction.java | 49 +--------- .../actions/CancelEditSpeciesFrequencyAction.java | 4 +- .../frequency/actions/RemoveObservationAction.java | 2 +- .../actions/ResetSpeciesFrequencyAction.java | 7 +- 10 files changed, 89 insertions(+), 179 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchTableHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchTableHandler.java index 91f6ae8..40afae2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchTableHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchTableHandler.java @@ -197,7 +197,7 @@ public class IndividualObservationBatchTableHandler implements Closeable { if (!optionalCruiseCache.isPresent()) { throw new IllegalStateException("Can't find cruise cache"); } - TuttiProtocol protocol = dataContext.isProtocolFilled()?dataContext.getProtocol():null; + TuttiProtocol protocol = dataContext.isProtocolFilled() ? dataContext.getProtocol() : null; this.individualObservationUICache = new IndividualObservationUICache(optionalCruiseCache.get(), model, protocol); this.individualObservationTable = ui.getObsTable(); this.frequencyTableModel = uiHandler.getTableModel(); @@ -459,14 +459,6 @@ public class IndividualObservationBatchTableHandler implements Closeable { int lastRow = e.getLastRow(); switch (e.getType()) { - case TableModelEvent.DELETE: - if (individualObservationTableModel.getRowCount() == 0) { - individualObservationTableModel.addNewRow(); - - } else { - individualObservationTableModel.recomputeRankOrders(firstRow); - } - break; case TableModelEvent.INSERT: for (int i = firstRow; i <= lastRow; i++) { @@ -483,10 +475,6 @@ public class IndividualObservationBatchTableHandler implements Closeable { } break; - case TableModelEvent.UPDATE: - if (individualObservationTableModel.getRowCount() == 0) { - individualObservationTableModel.addNewRow(); - } } model.recomputeCanEditLengthStep(); @@ -516,14 +504,14 @@ public class IndividualObservationBatchTableHandler implements Closeable { long rowsWithUserData; // si on etait en mode taille et que l'utilisateur avait saisi des tailles - if (oldCopyMode == CopyIndividualObservationMode.SIZE) { + if (CopyIndividualObservationMode.SIZE == oldCopyMode) { rowsWithUserData = model.getRows().stream() .filter(SpeciesFrequencyRowModel::withWeight) .count(); } else { rowsWithUserData = model.getRows().stream() - .filter(row -> row.getLengthStep() != null || row.withNumber() || row.withWeight()) + .filter(row -> row.withLengthStep() || row.withNumber() || row.withWeight()) .count(); } @@ -544,7 +532,9 @@ public class IndividualObservationBatchTableHandler implements Closeable { throw new PropertyVetoException("The user does not want to erase his data.", evt); } } + } + }); // Pour mettre à jour les mensurations suite au changement du mode de recopie des observations individuelles @@ -560,7 +550,6 @@ public class IndividualObservationBatchTableHandler implements Closeable { } boolean nothingCopyMode = CopyIndividualObservationMode.NOTHING == newCopyMode; - if (!nothingCopyMode) { source.setFrequenciesConfigurationMode(FrequencyConfigurationMode.RAFALE); @@ -568,7 +557,6 @@ public class IndividualObservationBatchTableHandler implements Closeable { } - // si on est en initialisation, ca ne sert à rien de regénérer les lignes, elles sont sensées être chargées if (source.isInitBatchEdition()) { @@ -578,19 +566,14 @@ public class IndividualObservationBatchTableHandler implements Closeable { return; } - model.setRowComputationInProgress(true); + model.clear(); + model.reloadRows(); - try { + // On change le mode de recopie sur toutes les observation individuelles + model2.setCopyIndividualObservationMode(newCopyMode); - model.getRows().clear(); - model.getRowsInError().clear(); - model.reloadRows(); - model2.recomputeRowsValidateState(); - uiHandler.reloadRowsFromIndividualObservations(); - - } finally { - model.setRowComputationInProgress(false); - } + // Recalcul des mensurations à partir des observations individuelles + uiHandler.reloadRowsFromIndividualObservations(); frequencyTableModel.fireTableDataChanged(); individualObservationTableModel.fireTableDataChanged(); @@ -659,7 +642,9 @@ public class IndividualObservationBatchTableHandler implements Closeable { model2.setNotEditableCaracteristic(sampleCategoryValues.keySet()); model2.setRows(individualObservationRows); - individualObservationTableModel.setRows(individualObservationRows); + if (individualObservationRows.isEmpty()) { + individualObservationTableModel.addNewRow(); + } model2.recomputeRowsValidateState(); individualObservationUICache.init(speciesBatch.getSpecies(), model2.getRows()); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchTableModel.java index a1eee9d..550333b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchTableModel.java @@ -344,5 +344,13 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab fireTableRowsDeleted(minSelection, maxSelection); + if (getRowCount() == 0) { + addNewRow(); + + } else { + recomputeRankOrders(minSelection); + } + } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchUIModel.java index 7c7f4b6..666646a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationBatchUIModel.java @@ -1,6 +1,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; +import fr.ifremer.tutti.persistence.entities.data.CopyIndividualObservationMode; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.type.WeightUnit; @@ -210,4 +211,11 @@ public class IndividualObservationBatchUIModel extends AbstractTuttiTableUIModel } + public void setCopyIndividualObservationMode(CopyIndividualObservationMode newCopyMode) { + + getRows().forEach(row -> row.setCopyIndividualObservationMode(newCopyMode)); + recomputeRowsValidateState(); + + } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java index 0600305..7bbb448 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java @@ -339,4 +339,8 @@ public class SpeciesFrequencyRowModel extends AbstractTuttiBeanUIModel<SpeciesBa setNumber(source.getNumber()); setWeight(source.getWeight()); } + + public boolean withLengthStep() { + return lengthStep != null; + } } 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 2960158..321da99 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 @@ -91,6 +91,7 @@ import java.awt.event.KeyEvent; import java.beans.PropertyVetoException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; @@ -336,8 +337,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci modelCaracteristic); // get step from the pmfm - float step = getStep(modelCaracteristic); - model.setStep(step); + model.setStep(modelCaracteristic); model.setMinStep(null); model.setMaxStep(null); @@ -363,8 +363,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, evt -> { Caracteristic newValue = (Caracteristic) evt.getNewValue(); // get step from the pmfm - float step1 = getStep(newValue); - model.setStep(step1); + model.setStep(newValue); if (CollectionUtils.isNotEmpty(getModel().getRows())) { for (SpeciesFrequencyRowModel rowModel : getModel().getRows()) { @@ -505,8 +504,6 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci SpeciesFrequencyUIModel model = getModel(); - model.setCanDisplayNotifications(false); - IOUtils.closeQuietly(individualObservationBatchTableHandler); IOUtils.closeQuietly(averageWeightsHistogramHandler); IOUtils.closeQuietly(frequenciesHistogramHandler); @@ -568,7 +565,6 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci model.setMaxStep(null); model.setRtp(null); model.setCopyRtpWeights(false); - model.setAddIndividualObservationOnRafale(false); // get species from protocol SpeciesProtocol speciesProtocol = getDataContext().isProtocolFilled() ? speciesOrBenthosBatchUISupport.getSpeciesProtocol(speciesBatch.getSpecies()) : null; @@ -806,13 +802,11 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci break; case QUALITATIVE: - List<CaracteristicQualitativeValue> values = - caracteristic.getQualitativeValue(); - addComboDataColumnToModel( - columnModel, - id, - caracteristicQualitativeDecorator, - values); + List<CaracteristicQualitativeValue> values = caracteristic.getQualitativeValue(); + addComboDataColumnToModel(columnModel, + id, + caracteristicQualitativeDecorator, + values); break; case TEXT: @@ -926,17 +920,6 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci return componentToFocus; } - protected float getStep(Caracteristic caracteristic) { - Float precision = null; - if (caracteristic != null) { - precision = caracteristic.getPrecision(); - } - if (precision == null) { - precision = 1f; - } - return precision; - } - protected void updateLogVisibility() { boolean logVisible = getModel().isRafaleMode() || getContext().isIchtyometerConnected(); @@ -1031,7 +1014,6 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci SpeciesBatchRowModel speciesBatch = model.getBatch(); model.setInitBatchEdition(true); - model.setCanDisplayNotifications(false); try { @@ -1112,7 +1094,6 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } finally { model.setInitBatchEdition(false); - model.setCanDisplayNotifications(true); } } @@ -1216,15 +1197,14 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } - public IndividualObservationBatchTableHandler getIndividualObservationBatchTableHandler() { - return individualObservationBatchTableHandler; + public void removeIndividualObservations(Collection<IndividualObservationBatchRowModel> rows) { + individualObservationBatchTableHandler.removeIndividualObservations(rows); } public boolean isSamplingCodeAvailable(Integer sampleCode, IndividualObservationBatchRowModel selectedRow) { IndividualObservationUICache individualObservationUICache = ui.getHandler().getIndividualObservationUICache(); - if (individualObservationUICache.isSamplingCodeNotAvailable(sampleCode)) { // le code n'est pas disponible (on le sait depuis le cache de l'écran) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index 9ba4669..973fa0b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -110,7 +110,6 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa public static final String PROPERTY_INIT_BATCH_EDITION = "initBatchEdition"; - public static final String PROPERTY_CAN_DISPLAY_NOTIFICATIONS = "canDisplayNotifications"; public static final String PROPERTY_NON_EMPTY_INDIVIDUAL_OBSERVATION_ROWS_IN_ERROR = "nonEmptyIndividualObservationRowsInError"; private final SpeciesOrBenthosBatchUISupport speciesOrBenthosBatchUISupport; @@ -260,7 +259,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa */ private CopyIndividualObservationMode copyIndividualObservationMode; - private boolean rowComputationInProgress; +// private boolean rowComputationInProgress; /** * Is the model is loading? @@ -272,10 +271,10 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa */ private boolean canDisplayNotifications; - /** - * A row is being created in rafale. Do not remove the sampling warning in this state. - */ - private boolean inRafaleRowCreation; +// /** +// * A row is being created in rafale. Do not remove the sampling warning in this state. +// */ +// private boolean inRafaleRowCreation; private final AverageWeightsHistogramModel averageWeightsHistogramModel; private final FrequenciesHistogramModel frequenciesHistogramModel; @@ -417,6 +416,17 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa return step; } + public void setStep(Caracteristic caracteristic) { + Float step = null; + if (caracteristic != null) { + step = caracteristic.getPrecision(); + } + if (step == null) { + step = 1f; + } + setStep(step); + } + public void setStep(Float step) { Object oldValue = getStep(); this.step = step; @@ -562,12 +572,6 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa return totalComputedOrNotWeight; } -// public void setTotalComputedOrNotWeight(ComputableData<Float> totalComputedOrNotWeight) { -// Object oldValue = getTotalComputedOrNotWeight(); -// this.totalComputedOrNotWeight = totalComputedOrNotWeight; -// firePropertyChange(PROPERTY_TOTAL_COMPUTED_OR_NOT_WEIGHT, oldValue, totalComputedOrNotWeight); -// } - public Float getTotalWeight() { return totalComputedOrNotWeight.getData(); } @@ -625,16 +629,6 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa } } - public boolean isAddIndividualObservationOnRafale() { - return addIndividualObservationOnRafale; - } - - public void setAddIndividualObservationOnRafale(boolean addIndividualObservationOnRafale) { - Object oldValue = isAddIndividualObservationOnRafale(); - this.addIndividualObservationOnRafale = addIndividualObservationOnRafale; - firePropertyChange(PROPERTY_ADD_INDIVIDUAL_OBSERVATION_ON_RAFALE, oldValue, addIndividualObservationOnRafale); - } - public CopyIndividualObservationMode getCopyIndividualObservationMode() { return copyIndividualObservationMode; } @@ -644,6 +638,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa this.copyIndividualObservationMode = copyIndividualObservationMode; try { + fireVetoableChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_MODE, oldValue, copyIndividualObservationMode); firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_ALL, oldValue == CopyIndividualObservationMode.ALL, copyIndividualObservationMode == CopyIndividualObservationMode.ALL); @@ -653,7 +648,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_SIZE, oldValue == CopyIndividualObservationMode.SIZE, copyIndividualObservationMode == CopyIndividualObservationMode.SIZE); - fireVetoableChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_MODE, oldValue, copyIndividualObservationMode); +// fireVetoableChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_MODE, oldValue, copyIndividualObservationMode); firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_MODE, oldValue, copyIndividualObservationMode); } catch (PropertyVetoException e) { @@ -661,15 +656,15 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa log.error("error in setting copyIndividualObservationMode", e); } this.copyIndividualObservationMode = oldValue; - firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_ALL, - copyIndividualObservationMode == CopyIndividualObservationMode.ALL, - oldValue == CopyIndividualObservationMode.ALL); - firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_NOTHING, - copyIndividualObservationMode == CopyIndividualObservationMode.NOTHING, - oldValue == CopyIndividualObservationMode.NOTHING); - firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_SIZE, - copyIndividualObservationMode == CopyIndividualObservationMode.SIZE, - oldValue == CopyIndividualObservationMode.SIZE); +// firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_ALL, +// copyIndividualObservationMode == CopyIndividualObservationMode.ALL, +// oldValue == CopyIndividualObservationMode.ALL); +// firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_NOTHING, +// copyIndividualObservationMode == CopyIndividualObservationMode.NOTHING, +// oldValue == CopyIndividualObservationMode.NOTHING); +// firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_SIZE, +// copyIndividualObservationMode == CopyIndividualObservationMode.SIZE, +// oldValue == CopyIndividualObservationMode.SIZE); } } @@ -698,14 +693,20 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows); } + public boolean isAddIndividualObservationOnRafale() { + return addIndividualObservationOnRafale; + } + + public void setAddIndividualObservationOnRafale(boolean addIndividualObservationOnRafale) { + Object oldValue = isAddIndividualObservationOnRafale(); + this.addIndividualObservationOnRafale = addIndividualObservationOnRafale; + firePropertyChange(PROPERTY_ADD_INDIVIDUAL_OBSERVATION_ON_RAFALE, oldValue, addIndividualObservationOnRafale); + } + public int getNbRowsWithWeight() { return cache.getNbRowsWithWeight(); } -// public boolean isAllRowsWithWeight() { -// return cache.getNbRowsWithWeight() == rows.size(); -// } - public boolean isSomeRowsWithWeightAndOtherWithout() { boolean result; @@ -848,32 +849,6 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa } - public boolean isRowComputationInProgress() { - return rowComputationInProgress; - } - - public void setRowComputationInProgress(boolean rowComputationInProgress) { - this.rowComputationInProgress = rowComputationInProgress; - } - - public boolean isCanDisplayNotifications() { - return canDisplayNotifications; - } - - public void setCanDisplayNotifications(boolean canDisplayNotifications) { - Object oldValue = isCanDisplayNotifications(); - this.canDisplayNotifications = canDisplayNotifications; - firePropertyChange(PROPERTY_CAN_DISPLAY_NOTIFICATIONS, oldValue, canDisplayNotifications); - } - - public boolean isInRafaleRowCreation() { - return inRafaleRowCreation; - } - - public void setInRafaleRowCreation(boolean inRafaleRowCreation) { - this.inRafaleRowCreation = inRafaleRowCreation; - } - protected final void recomputeRowValidState(SpeciesFrequencyRowModel row) { // recompute row valid state @@ -916,4 +891,8 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa firePropertyChanged(PROPERTY_NON_EMPTY_INDIVIDUAL_OBSERVATION_ROWS_IN_ERROR, oldValue, nonEmptyIndividualObservationRowsInError); } + public void clear() { + getRows().clear(); + getRowsInError().clear(); + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java index 6f29f2c..d10a1f5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java @@ -80,39 +80,6 @@ public class ApplySpeciesFrequencyRafaleAction { SpeciesFrequencyRowModel row = tableModel.addRafaleRow(aroundLengthStep); int rowIndex = tableModel.getRowIndex(row); -// Map<Float, SpeciesFrequencyRowModel> rowsByStep = model.getRowCache(); -// -// SpeciesFrequencyRowModel row = rowsByStep.get(aroundLengthStep); -// -// int rowIndex; -// -// if (row != null) { -// -// // increments current row -// Integer number = row.getNumber(); -// row.setNumber((number == null ? 0 : number) + 1); -// rowIndex = tableModel.updateRow(row); -// -// } else { -// -// // create a new row -// -// row = tableModel.createNewRow(); -// row.setLengthStep(aroundLengthStep); -// row.setNumber(1); -// row.setValid(handler.isRowValid(row)); -// -// // get new index -// List<Float> steps = new ArrayList<>(rowsByStep.keySet()); -// steps.add(aroundLengthStep); -// -// Collections.sort(steps); -// -// rowIndex = steps.indexOf(aroundLengthStep); -// -// tableModel.addNewRow(rowIndex, row); -// } - model.recomputeTotalNumber(); SwingUtilities.invokeLater(() -> selectRow(ui.getTable(), rowIndex)); @@ -132,25 +99,11 @@ public class ApplySpeciesFrequencyRafaleAction { IndividualObservationBatchRowModel obsRow = obsTableModel.addRafaleRow(step); -// IndividualObservationBatchRowModel obsRow = obsTableModel.getEmptyRow(); -// if (obsRow == null) { -// obsRow = obsTableModel.createNewRow(); -// obsTableModel.addNewRow(obsRow); -// } -// obsRow.setSize(step); -// obsTableModel.updateRow(obsRow); - newLogRow.setObsRow(obsRow); int rowIndex = obsTableModel.getRowIndex(obsRow); SwingUtilities.invokeLater(() -> { - - model.setInRafaleRowCreation(true); - try { - selectRow(ui.getObsTable(), rowIndex); - } finally { - model.setInRafaleRowCreation(false); - } + selectRow(ui.getObsTable(), rowIndex); }); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java index 8fdecd0..fdd33b3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java @@ -72,13 +72,11 @@ public class CancelEditSpeciesFrequencyAction extends LongActionSupport<SpeciesF log.debug("Cancel UI " + getUI()); } - getModel().setCanDisplayNotifications(false); - IndividualObservationUICache individualObservationUICache = handler.getIndividualObservationUICache(); List<IndividualObservationBatchRowModel> individualObservationRows = getModel().getIndividualObservationModel().getRows(); - handler.getIndividualObservationBatchTableHandler().removeIndividualObservations(individualObservationRows); + handler.removeIndividualObservations(individualObservationRows); SpeciesBatchRowModel batch = getModel().getBatch(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java index 8f9cb28..a9ff830 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java @@ -100,7 +100,7 @@ public class RemoveObservationAction extends SimpleActionSupport<SpeciesFrequenc }); - handler.getIndividualObservationBatchTableHandler().removeIndividualObservations(rowsToDelete); + handler.removeIndividualObservations(rowsToDelete); model.setModify(true); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java index 2e9d9b4..3bdc75b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java @@ -92,17 +92,12 @@ public class ResetSpeciesFrequencyAction extends LongActionSupport<SpeciesFreque SpeciesFrequencyUIModel model = getModel(); - model.setCanDisplayNotifications(false); - // remove all frequencies model.setRows(new ArrayList<>()); // remove all individual observations List<IndividualObservationBatchRowModel> rows = model.getIndividualObservationModel().getRows(); - handler.getIndividualObservationBatchTableHandler().removeIndividualObservations(rows); - - - model.setCanDisplayNotifications(true); + handler.removeIndividualObservations(rows); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.