This is an automated email from the git hooks/post-receive script. New commit to branch feature/8023_suite in repository tutti. See http://git.codelutin.com/tutti.git commit cfc9425d823876cf87d5884ae865d5028432f68c Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 2 15:12:41 2016 +0100 on reset le mode de copie à l'ouverture de l'écran, sinon on ne voit pas les mensurations si le mode était en copie sur le batch précédent (refs #8023) --- .../frequency/SpeciesFrequencyUIHandler.java | 3 ++- .../species/frequency/SpeciesFrequencyUIModel.java | 24 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) 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 a353385..b0b32e2 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 @@ -520,7 +520,6 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci JOptionPane.QUESTION_MESSAGE); if (i == JOptionPane.CANCEL_OPTION) { - ui.getCopyNothingButton().setSelected(true); throw new PropertyVetoException("The user does not want to erase his data.", evt); } } @@ -796,6 +795,8 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci Collections.sort(rows); model.setLengthStepCaracteristic(lengthStepCaracteristic); + model.setRows(null); + model.setCopyIndividualObservationMode(CopyIndividualObservationMode.NOTHING); model.setRows(rows); IndividualObservationBatchTableModel obsTableModel = getObsTableModel(); 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 e093548..2527646 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 @@ -108,6 +108,12 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa public static final String PROPERTY_COPY_INDIVIDUAL_OBSERVATION_MODE = "copyIndividualObservationMode"; + public static final String PROPERTY_COPY_INDIVIDUAL_OBSERVATION_ALL = "copyIndividualObservationAll"; + + public static final String PROPERTY_COPY_INDIVIDUAL_OBSERVATION_NOTHING = "copyIndividualObservationNothing"; + + public static final String PROPERTY_COPY_INDIVIDUAL_OBSERVATION_SIZE = "copyIndividualObservationSize"; + public static final String PROPERTY_INDIVIDUAL_OBSERVATION_ROWS = "individualObservationRows"; public static final String PROPERTY_INDIVIDUAL_OBSERVATION_ROWS_IN_ERROR = "individualObservationRowsInError"; @@ -613,6 +619,15 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa this.copyIndividualObservationMode = copyIndividualObservationMode; try { + firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_ALL, + oldValue == CopyIndividualObservationMode.ALL, + copyIndividualObservationMode == CopyIndividualObservationMode.ALL); + firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_NOTHING, + oldValue == CopyIndividualObservationMode.NOTHING, + copyIndividualObservationMode == CopyIndividualObservationMode.NOTHING); + firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_SIZE, + oldValue == CopyIndividualObservationMode.SIZE, + copyIndividualObservationMode == CopyIndividualObservationMode.SIZE); fireVetoableChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_MODE, oldValue, copyIndividualObservationMode); firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_MODE, oldValue, copyIndividualObservationMode); @@ -621,6 +636,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); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.