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 16c957fa9ebb87c8cb12588d1a2dc947e53916b4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 08:46:18 2016 +0200 Correction des mauvaises unités utilisés dans les écran «espèces» --- .../species/create/CreateSpeciesBatchUI.jaxx | 6 +-- .../species/create/CreateSpeciesBatchUI.jcss | 3 -- .../create/CreateSpeciesBatchUIHandler.java | 49 +++++++++------------- .../species/create/CreateSpeciesBatchUIModel.java | 8 +++- .../catches/species/edit/SpeciesBatchUI.jaxx | 12 +++--- .../catches/species/edit/SpeciesBatchUI.jcss | 6 --- .../species/edit/SpeciesBatchUIHandler.java | 22 +++++----- .../frequency/SpeciesFrequencyRowModel.java | 11 +++-- .../frequency/SpeciesFrequencyTableModel.java | 4 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 2 +- .../species/frequency/SpeciesFrequencyUI.jcss | 1 - .../frequency/SpeciesFrequencyUIHandler.java | 4 +- .../species/frequency/SpeciesFrequencyUIModel.java | 2 +- .../catches/species/split/SplitSpeciesBatchUI.jaxx | 4 +- .../catches/species/split/SplitSpeciesBatchUI.jcss | 2 - .../species/split/SplitSpeciesBatchUIHandler.java | 4 +- .../species/split/SplitSpeciesBatchUIModel.java | 14 +++---- 17 files changed, 67 insertions(+), 87 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx index b0a022c..3bd6868 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx @@ -112,7 +112,7 @@ public String getSpeciesOrBenthosContext() { return speciesOrBenthosContext; } <!-- Species batch weight --> <row> <cell anchor='west'> - <JLabel id='batchSampleCategoryWeightLabel'/> + <JLabel id='batchSampleCategoryWeightLabel' styleClass='labelWithUnit'/> </cell> <cell weightx='1.0' columns='2'> <NumberEditor id='batchSampleCategoryWeightField' constructorParams='this'/> @@ -122,7 +122,7 @@ public String getSpeciesOrBenthosContext() { return speciesOrBenthosContext; } <!-- Species batch sample weight --> <row> <cell anchor='west'> - <JLabel id='batchWeightLabel'/> + <JLabel id='batchWeightLabel' styleClass='labelWithUnit'/> </cell> <cell weightx='1.0' columns='2'> <NumberEditor id='batchWeightField' constructorParams='this'/> @@ -166,7 +166,7 @@ public String getSpeciesOrBenthosContext() { return speciesOrBenthosContext; } <!-- Sample Total weight --> <row> <cell anchor='west'> - <JLabel id='sampleWeightLabel'/> + <JLabel id='sampleWeightLabel' styleClass='labelWithUnit'/> </cell> <cell weightx='1.0'> <JTextField id='sampleWeightField'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jcss index 7fac441..b084806 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jcss @@ -82,7 +82,6 @@ NumberEditor { toolTipText: "tutti.createSpeciesBatch.field.batchSampleCategoryWeight.tip"; labelFor: {batchSampleCategoryWeightField}; _help: {"tutti.createSpeciesBatch.field.batchSampleCategoryWeight.help"}; - _addWeightUnit: {handler.getConfig().getSpeciesWeightUnit()}; } #batchSampleCategoryWeightField { @@ -97,7 +96,6 @@ NumberEditor { toolTipText: "tutti.createSpeciesBatch.field.batchWeight.tip"; labelFor: {batchWeightField}; _help: {"tutti.createSpeciesBatch.field.batchWeight.help"}; - _addWeightUnit: {handler.getConfig().getSpeciesWeightUnit()}; } #batchWeightField { @@ -149,7 +147,6 @@ NumberEditor { toolTipText: "tutti.createSpeciesBatch.field.sampleWeight.tip"; labelFor: {sampleWeightField}; _help: {"tutti.createSpeciesBatch.field.sampleWeightField.help"}; - _addWeightUnit: {handler.getConfig().getSpeciesWeightUnit()}; } #sampleWeightField { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java index e952a1b..d32dd16 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java @@ -32,7 +32,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.EditSpeciesBatchPanelUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUIModel; @@ -64,8 +63,7 @@ import java.util.Optional; public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<SplitSpeciesBatchRowModel, CreateSpeciesBatchUIModel, CreateSpeciesBatchUI> { /** Logger. */ - private static final Log log = - LogFactory.getLog(CreateSpeciesBatchUIHandler.class); + private static final Log log = LogFactory.getLog(CreateSpeciesBatchUIHandler.class); public static final PropertyChangeListener PROPERTY_WEIGHT_CHANGED_LISTENER = new PropertyChangeListener() { @@ -184,22 +182,13 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl * @since 2.5 */ protected CaracteristicQualitativeValue sortedValue; - - /** - * Sample categories model. - * - * @since 2.4 - */ - protected SampleCategoryModel sampleCategoryModel; - - /** - * Weight unit. - * - * @since 2.6 - */ - protected WeightUnit weightUnit; - - protected SpeciesOrBenthosBatchUISupport speciesOrBenthosBatchUISupport; +// +// /** +// * Sample categories model. +// * +// * @since 2.4 +// */ +// protected SampleCategoryModel sampleCategoryModel; public CreateSpeciesBatchUIHandler() { super(SplitSpeciesBatchRowModel.PROPERTY_SELECTED, @@ -279,9 +268,7 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl super.beforeInit(ui); - this.speciesOrBenthosBatchUISupport = ui.getContextValue(SpeciesOrBenthosBatchUISupport.class, ui.getSpeciesOrBenthosContext()); - this.weightUnit = speciesOrBenthosBatchUISupport.getWeightUnit(); - this.sampleCategoryModel = getDataContext().getSampleCategoryModel(); + SampleCategoryModel sampleCategoryModel = getDataContext().getSampleCategoryModel(); SampleCategoryModelEntry caracteristic = sampleCategoryModel.getCategoryById(sampleCategoryModel.getFirstCategoryId()); @@ -298,6 +285,7 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl Objects.requireNonNull(vracValue, "Could not found vrac qualitative value"); sortedValue = vracValue; + SpeciesOrBenthosBatchUISupport speciesOrBenthosBatchUISupport = ui.getContextValue(SpeciesOrBenthosBatchUISupport.class, ui.getSpeciesOrBenthosContext()); CreateSpeciesBatchUIModel model = new CreateSpeciesBatchUIModel(speciesOrBenthosBatchUISupport, sampleCategoryModel); this.ui.setContextValue(model); listModelIsModify(model); @@ -308,6 +296,8 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl initUI(this.ui); + CreateSpeciesBatchUIModel model = getModel(); + initBeanFilterableComboBox(this.ui.getSpeciesComboBox(), new ArrayList<>(), null, @@ -316,7 +306,7 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl List<SampleCategoryModelEntry> categories = new ArrayList<>(); // add all categories - categories.addAll(sampleCategoryModel.getCategory()); + categories.addAll(model.getSampleCategoryModel().getCategory()); // remove the first one (V/HV) categories.remove(0); @@ -332,7 +322,6 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl new ArrayList<>(caracteristic.getQualitativeValue()), null); - CreateSpeciesBatchUIModel model = getModel(); model.addPropertyChangeListener(CreateSpeciesBatchUIModel.PROPERTY_SPECIES, PROPERTY_SPECIES_CHANGED_LISTENER); @@ -402,7 +391,7 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl // compute which species can still be used - List<Species> allSpecies = speciesOrBenthosBatchUISupport.getReferentSpeciesWithSurveyCode(true); + List<Species> allSpecies = model.getSpeciesOrBenthosBatchUISupport().getReferentSpeciesWithSurveyCode(true); speciesToUse.addAll(allSpecies); } @@ -437,8 +426,10 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl if (log.isDebugEnabled()) { log.debug("Generate table model for category " + category); } + CreateSpeciesBatchUIModel model = getModel(); + // when generate a new table model, then reset previous rows from model - getModel().setRows(null); + model.setRows(null); Caracteristic data = null; @@ -482,14 +473,14 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl addFloatColumnToModel(columnModel, SplitSpeciesBatchTableModel.WEIGHT, - weightUnit, + model.getSpeciesOrBenthosBatchUISupport().getWeightUnit(), table); } } // create table model SplitSpeciesBatchTableModel tableModel = new SplitSpeciesBatchTableModel(columnModel, - getModel(), + model, editableCategoryValue, false); @@ -530,7 +521,7 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl "(can add a first empty row? " + editableCategoryValue + ")."); } - getModel().setRows(rows); + model.setRows(rows); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java index 2cf453d..5cbc3f5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java @@ -28,6 +28,7 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SelectedCategoryAble; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchRowModel; @@ -48,8 +49,7 @@ import static org.nuiton.i18n.I18n.t; */ public class CreateSpeciesBatchUIModel extends AbstractTuttiTableUIModel<CreateSpeciesBatchUIModel, SplitSpeciesBatchRowModel, CreateSpeciesBatchUIModel> implements SelectedCategoryAble { - private final static Log log = - LogFactory.getLog(CreateSpeciesBatchUIModel.class); + private final static Log log = LogFactory.getLog(CreateSpeciesBatchUIModel.class); private static final long serialVersionUID = 1L; @@ -362,4 +362,8 @@ public class CreateSpeciesBatchUIModel extends AbstractTuttiTableUIModel<CreateS public SpeciesOrBenthosBatchUISupport getSpeciesOrBenthosBatchUISupport() { return speciesOrBenthosBatchUISupport; } + + public WeightUnit getWeightUnit() { + return speciesOrBenthosBatchUISupport.getWeightUnit(); + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUI.jaxx index eafb22d..1251a43 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUI.jaxx @@ -102,13 +102,13 @@ public String getSpeciesOrBenthosContext() { return speciesOrBenthosContext; } <!-- Poids total / Poids total vrac --> <row> <cell anchor='west'> - <JLabel id='totalWeightLabel'/> + <JLabel id='totalWeightLabel' styleClass='labelWithUnit'/> </cell> <cell weightx='1.0'> <JTextField id='totalWeightField'/> </cell> <cell anchor='west'> - <JLabel id='totalSortedWeightLabel'/> + <JLabel id='totalSortedWeightLabel' styleClass='labelWithUnit'/> </cell> <cell weightx='1.0'> <ComputableDataEditor id='totalSortedWeightField' genericType="Float" constructorParams='this'/> @@ -118,13 +118,13 @@ public String getSpeciesOrBenthosContext() { return speciesOrBenthosContext; } <!-- Poids échantillonné vrac / Poids total hors vrac --> <row> <cell> - <JLabel id='totalSampleSortedWeightLabel'/> + <JLabel id='totalSampleSortedWeightLabel' styleClass='labelWithUnit'/> </cell> <cell> <JTextField id='totalSampleSortedWeightField'/> </cell> <cell> - <JLabel id='totalUnsortedWeightLabel'/> + <JLabel id='totalUnsortedWeightLabel' styleClass='labelWithUnit'/> </cell> <cell> <JTextField id='totalUnsortedWeightField'/> @@ -134,13 +134,13 @@ public String getSpeciesOrBenthosContext() { return speciesOrBenthosContext; } <!-- Poids inerte / Poids vivant non détaillé --> <row> <cell> - <JLabel id='totalInertWeightLabel'/> + <JLabel id='totalInertWeightLabel' styleClass='labelWithUnit'/> </cell> <cell> <ComputableDataEditor id='totalInertWeightField' genericType="Float" constructorParams='this'/> </cell> <cell> - <JLabel id='totalLivingNotItemizedWeightLabel'/> + <JLabel id='totalLivingNotItemizedWeightLabel' styleClass='labelWithUnit'/> </cell> <cell> <ComputableDataEditor id='totalLivingNotItemizedWeightField' genericType="Float" constructorParams='this'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUI.jcss index 9980cf3..91b485a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUI.jcss @@ -85,7 +85,6 @@ ComputableDataEditor { toolTipText: "tutti.editSpeciesBatch.field.speciesTotalWeight.tip"; labelFor: {totalWeightField}; _help: {"tutti.editSpeciesBatch.field.speciesTotalWeight.help"}; - _addWeightUnit: {model.getWeightUnit()}; } #totalWeightField { @@ -99,7 +98,6 @@ ComputableDataEditor { toolTipText: "tutti.editSpeciesBatch.field.speciesTotalSortedWeight.tip"; labelFor: {totalSortedWeightField}; _help: {"tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help"}; - _addWeightUnit: {model.getWeightUnit()}; } #totalSortedWeightField { @@ -113,7 +111,6 @@ ComputableDataEditor { toolTipText: "tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip"; labelFor: {totalSampleSortedWeightField}; _help: {"tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help"}; - _addWeightUnit: {model.getWeightUnit()}; } #totalSampleSortedWeightField { @@ -127,7 +124,6 @@ ComputableDataEditor { toolTipText: "tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip"; labelFor: {totalUnsortedWeightField}; _help: {"tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.help"}; - _addWeightUnit: {model.getWeightUnit()}; } #totalUnsortedWeightField { @@ -141,7 +137,6 @@ ComputableDataEditor { toolTipText: "tutti.editSpeciesBatch.field.speciesTotalInertWeight.tip"; labelFor: {totalInertWeightField}; _help: {"tutti.editSpeciesBatch.field.speciesTotalInertWeight.help"}; - _addWeightUnit: {model.getWeightUnit()}; } #totalInertWeightField { @@ -155,7 +150,6 @@ ComputableDataEditor { toolTipText: "tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.tip"; labelFor: {totalLivingNotItemizedWeightField}; _help: {"tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help"}; - _addWeightUnit: {model.getWeightUnit()}; } #totalLivingNotItemizedWeightField { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUIHandler.java index ec90dba..7f2a971 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUIHandler.java @@ -55,7 +55,6 @@ import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentCellRenderer; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellEditor; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellRenderer; import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell; -import fr.ifremer.tutti.util.Weights; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JTables; import jaxx.runtime.validator.swing.SwingValidator; @@ -757,10 +756,8 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec { // Weight column addColumnToModel(columnModel, - ComputableDataTableCell.newEditor( - Float.class, weightUnit, computedDataColor), - ComputableDataTableCell.newRender( - defaultRenderer, weightUnit, computedDataColor), + ComputableDataTableCell.newEditor(weightUnit, computedDataColor), + ComputableDataTableCell.newRender(defaultRenderer, weightUnit, computedDataColor), SpeciesBatchTableModel.WEIGHT, weightUnit); } @@ -983,9 +980,11 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec // Create rows in batch table model + //FIXME Weight check!!! Float parentWeight = parentBatch.getFinestCategory().getNotNullWeight(); - boolean subSample = parentWeight != null && totalRowWeight != null - && Weights.isGreaterWeight(parentWeight, totalRowWeight); + boolean subSample = parentWeight != null + && totalRowWeight != null + && getWeightUnit().isGreaterThan(parentWeight, totalRowWeight); List<SpeciesBatchRowModel> newBatches = Lists.newArrayList(); for (SplitSpeciesBatchRowModel row : rows) { if (row.isValid()) { @@ -1061,9 +1060,10 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec // re compute the sub sample property for all childs int categoryIndex = sampleCategoryModel.indexOf(sampleCategoryDef); + //FIXME Weight check!!! Float parentWeight = parentBatch.getSampleCategoryByIndex(categoryIndex - 1).getNotNullWeight(); boolean subSample = parentWeight != null && totalRowWeight != null - && Weights.isGreaterWeight(parentWeight, totalRowWeight); + && getWeightUnit().isGreaterThan(parentWeight, totalRowWeight); Set<SpeciesBatchRowModel> shell = Sets.newHashSet(); parentBatch.collectShell(shell); @@ -1199,9 +1199,11 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec batchChilds.add(childRow); } + //FIXME Weight check!!! Float rowWeight = newRow.getFinestCategory().getNotNullWeight(); - boolean subSample = rowWeight != null && childrenWeights != null - && Weights.isSmallerWeight(childrenWeights, rowWeight); + boolean subSample = rowWeight != null + && childrenWeights != null + && weightUnit.isSmallerThan(childrenWeights, rowWeight); for (SpeciesBatchRowModel childRow : batchChilds) { childRow.getFinestCategory().setSubSample(subSample); } 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 cf3d7d1..0600305 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 @@ -30,7 +30,6 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequencys; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.tutti.util.Weights; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -231,14 +230,14 @@ public class SpeciesFrequencyRowModel extends AbstractTuttiBeanUIModel<SpeciesBa public boolean withWeight() { Float weight = getWeight(); - return Weights.isNotNullNorZero(weight); + return weightUnit.isNotNullNorZero(weight); } /** * @param weightToAdd weight (cannot be negative) to add */ public void addToWeight(float weightToAdd) { - if (!Weights.isPositive(weightToAdd)) { + if (weightUnit.isSmallerThanZero(weightToAdd)) { throw new IllegalArgumentException("you must add a positive weight"); } if (weight == null) { @@ -251,14 +250,14 @@ public class SpeciesFrequencyRowModel extends AbstractTuttiBeanUIModel<SpeciesBa * @param weightToRemove weight (cannot be negative) to remove */ public void removeFromWeight(float weightToRemove) { - if (!Weights.isPositive(weightToRemove)) { + if (weightUnit.isSmallerThanZero(weightToRemove)) { throw new IllegalArgumentException("you must remove a positive weight"); } if (weight == null) { weight = 0f; } - if (Weights.isSmallerWeight(weight, weightToRemove)) { - throw new IllegalArgumentException("the weight to remove cannot be greater than the weight"); + if (weightUnit.isSmallerThan(weight, weightToRemove)) { + throw new IllegalArgumentException("the weight to remove cannot be greater than the initial weight"); } setWeight(weightUnit.round(weight - weightToRemove)); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java index faae041..38c945c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java @@ -537,7 +537,7 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp log.info("add weight to frequency (lengthStep: " + lengthStep + "): " + weight); } - Preconditions.checkState(Weights.isPositive(weight)); + Preconditions.checkState(weightUnit.isGreaterThanZero(weight)); SpeciesFrequencyRowModel row = getOrCreateRowForLengthStep(lengthStep); @@ -561,7 +561,7 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp log.info("remove weight to frequency (lengthStep: " + lengthStep + "): " + weight); } - Preconditions.checkState(Weights.isPositive(weight)); + Preconditions.checkState(weightUnit.isGreaterThanZero(weight)); Optional<SpeciesFrequencyRowModel> optionalRow = getOptionalRowForLengthStep(lengthStep); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx index 340709f..aeeb4ad 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx @@ -286,7 +286,7 @@ protected int getLengthStepPanelPreferedWidth() { </row> <row> <cell> - <JLabel id='totalWeightLabel'/> + <JLabel id='totalWeightLabel' styleClass='labelWithUnit'/> </cell> <cell weightx="1"> <ComputableDataEditor id='totalWeightField' genericType="Float" constructorParams='this'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss index 5764b9d..cb41d94 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss @@ -448,7 +448,6 @@ ComputableDataEditor { labelFor: {totalWeightField}; enabled: {model.getTotalWeight() != null}; _help: {"tutti.editSpeciesFrequencies.field.totalWeight.help"}; - _addWeightUnit: {model.getWeightUnit()}; } #totalWeightField { 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 60371b7..644e408 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 @@ -272,8 +272,8 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci weightToAdd = newValue - oldValue; } - if (weightToAdd != null) { - if (Weights.isPositive(weightToAdd)) { + if (weightUnit.isNotNullNorZero(weightToAdd)) { + if (weightUnit.isGreaterThanZero(weightToAdd)) { getTableModel().addWeightToFrequencyRow(row, weightToAdd); } else { getTableModel().removeWeightToFrequencyRow(row, -weightToAdd); 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 f0f9d67..0dc3fa4 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 @@ -656,7 +656,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa Float totalWeight = getTotalWeight(); Float totalComputedWeight = getTotalComputedWeight(); return totalWeight != null && totalComputedWeight != null - && Weights.isEqualWeight(totalWeight, totalComputedWeight); + && WeightUnit.KG.isEquals(totalWeight, totalComputedWeight); } public Rtp getRtp() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx index 1831fe0..abe78be 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx @@ -86,7 +86,7 @@ public String getSpeciesOrBenthosContext() { return speciesOrBenthosContext; } <!-- Incoming Batch Total weight --> <row> <cell anchor='west'> - <JLabel id='batchWeightLabel'/> + <JLabel id='batchWeightLabel' styleClass='labelWithUnit'/> </cell> <cell weightx='1.0'> <JTextField id='batchWeightField'/> @@ -96,7 +96,7 @@ public String getSpeciesOrBenthosContext() { return speciesOrBenthosContext; } <!-- Sample Total weight --> <row> <cell anchor='west'> - <JLabel id='sampleWeightLabel'/> + <JLabel id='sampleWeightLabel' styleClass='labelWithUnit'/> </cell> <cell weightx='1.0'> <JTextField id='sampleWeightField'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jcss index 2e8f900..fdda5c3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jcss @@ -44,7 +44,6 @@ toolTipText: "tutti.splitSpeciesBatch.field.batchWeightField.tip"; labelFor: {batchWeightField}; _help: {"tutti.splitSpeciesBatch.field.batchWeightField.help"}; - _addWeightUnit: {handler.getConfig().getSpeciesWeightUnit()}; } #batchWeightField { @@ -59,7 +58,6 @@ toolTipText: "tutti.splitSpeciesBatch.field.sampleWeightField.tip"; labelFor: {sampleWeightField}; _help: {"tutti.splitSpeciesBatch.field.sampleWeightField.help"}; - _addWeightUnit: {handler.getConfig().getSpeciesWeightUnit()}; } #sampleWeightField { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java index 410509b..e739663 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java @@ -118,7 +118,7 @@ public class SplitSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spli } }; - protected SpeciesOrBenthosBatchUISupport speciesOrBenthosBatchUISupport; +// protected SpeciesOrBenthosBatchUISupport speciesOrBenthosBatchUISupport; public SplitSpeciesBatchUIHandler() { super(SplitSpeciesBatchRowModel.PROPERTY_SELECTED, @@ -204,7 +204,7 @@ public class SplitSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spli super.beforeInit(ui); SampleCategoryModel sampleCategoryModel = getDataContext().getSampleCategoryModel(); - this.speciesOrBenthosBatchUISupport = ui.getContextValue(SpeciesOrBenthosBatchUISupport.class, ui.getSpeciesOrBenthosContext()); + SpeciesOrBenthosBatchUISupport speciesOrBenthosBatchUISupport = ui.getContextValue(SpeciesOrBenthosBatchUISupport.class, ui.getSpeciesOrBenthosContext()); SplitSpeciesBatchUIModel model = new SplitSpeciesBatchUIModel(speciesOrBenthosBatchUISupport, sampleCategoryModel); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java index 5749cd0..df1dc2b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java @@ -89,13 +89,6 @@ public class SplitSpeciesBatchUIModel protected SampleCategoryModel sampleCategoryModel; /** - * Weight unit. - * - * @since 2.5 - */ - protected final WeightUnit weightUnit; - - /** * Is ui in split mode ? * * @since 2.6 @@ -108,13 +101,12 @@ public class SplitSpeciesBatchUIModel SampleCategoryModel sampleCategoryModel) { super(SpeciesBatchRowModel.class, null, null); this.speciesOrBenthosBatchUISupport = speciesOrBenthosBatchUISupport; - this.weightUnit = speciesOrBenthosBatchUISupport.getWeightUnit(); this.sampleCategoryModel = sampleCategoryModel; } @Override protected SpeciesBatchRowModel newEntity() { - return new SpeciesBatchRowModel(weightUnit, sampleCategoryModel); + return new SpeciesBatchRowModel(getWeightUnit(), sampleCategoryModel); } public SpeciesOrBenthosBatchUISupport getSpeciesOrBenthosBatchUISupport() { @@ -179,4 +171,8 @@ public class SplitSpeciesBatchUIModel this.splitMode = splitMode; firePropertyChange(PROPERTY_SPLIT_MODE, oldValue, splitMode); } + + public WeightUnit getWeightUnit() { + return speciesOrBenthosBatchUISupport.getWeightUnit(); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.