branch develop updated (50f07c7 -> 03a5c31)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 50f07c7 Retour sur develop pour intégrer les autres tickets avant release Merge branch 'feature/8242' into develop new e2b2a0e Clean code new 29ac08e Compacter la table des observations individuelles à l'ouverture de l'écran (See #8202) new 03a5c31 Livrable #8202 Merge branch 'feature/8202' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 03a5c31cbc5180512a0468322ade6d957a463bd6 Merge: e2b2a0e 29ac08e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 10:50:09 2016 +0200 Livrable #8202 Merge branch 'feature/8202' into develop commit 29ac08ef42fb729041920da906325680c6f16f89 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 10:50:07 2016 +0200 Compacter la table des observations individuelles à l'ouverture de l'écran (See #8202) commit e2b2a0e144dec038a2509a2959fd037a5da6831e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 10:46:58 2016 +0200 Clean code Summary of changes: .../IndividualObservationBatchTableHandler.java | 2 ++ .../species/frequency/SpeciesFrequencyUIModel.java | 28 ---------------------- 2 files changed, 2 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 e2b2a0e144dec038a2509a2959fd037a5da6831e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 10:46:58 2016 +0200 Clean code --- .../species/frequency/SpeciesFrequencyUIModel.java | 28 ---------------------- 1 file changed, 28 deletions(-) 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 973fa0b..8cbd151 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 @@ -259,23 +259,11 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa */ private CopyIndividualObservationMode copyIndividualObservationMode; -// private boolean rowComputationInProgress; - /** * Is the model is loading? */ private boolean initBatchEdition; - /** - * Can smapling notifications or summary be displayed? - */ - private boolean canDisplayNotifications; - -// /** -// * 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; private final IndividualObservationBatchUIModel individualObservationModel; @@ -299,12 +287,6 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa setEmptyRows(new HashSet<>()); this.individualObservationModel = new IndividualObservationBatchUIModel(sexCaracteristic, individualObservationWeightUnit, defaultCaracteristic); - -// JavaBeanObjectPropagateChangeListener.listenAndPropagate(individualObservationModel, -// this, -// IndividualObservationBatchUIModel.PROPERTY_NON_EMPTY_ROWS_IN_ERROR, -// "nonEmptyIndividualObservationRowsInError"); - this.averageWeightsHistogramModel = new AverageWeightsHistogramModel(weightUnit); this.frequenciesHistogramModel = new FrequenciesHistogramModel(); } @@ -648,7 +630,6 @@ 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); firePropertyChange(PROPERTY_COPY_INDIVIDUAL_OBSERVATION_MODE, oldValue, copyIndividualObservationMode); } catch (PropertyVetoException e) { @@ -656,15 +637,6 @@ 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>.
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 29ac08ef42fb729041920da906325680c6f16f89 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 10:50:07 2016 +0200 Compacter la table des observations individuelles à l'ouverture de l'écran (See #8202) --- .../species/frequency/IndividualObservationBatchTableHandler.java | 2 ++ 1 file changed, 2 insertions(+) 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 40afae2..43087ae 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 @@ -649,6 +649,8 @@ public class IndividualObservationBatchTableHandler implements Closeable { individualObservationUICache.init(speciesBatch.getSpecies(), model2.getRows()); + individualObservationTable.packAll(); + } public boolean isSampleCodeMenusEnabled(int modelRowIndex) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 03a5c31cbc5180512a0468322ade6d957a463bd6 Merge: e2b2a0e 29ac08e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 10:50:09 2016 +0200 Livrable #8202 Merge branch 'feature/8202' into develop .../species/frequency/IndividualObservationBatchTableHandler.java | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm