[tutti] branch develop updated (fc62939 -> 8312ade)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from fc62939 fixes #5699: [CAPTURE] l'élévation des poids remet l'ordre des lignes selon l'ordre saisie mais ne remet pas le filtre à Tri/Saisie donc il y a une incohérence à l'écran new 8312ade fixes #5697: [CAPTURE] mauvais affichage de // The 1 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 8312ade6ee2c9a5f9cc22f87378ab5cc6f53e585 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 30 11:38:48 2014 +0200 fixes #5697: [CAPTURE] mauvais affichage de // Summary of changes: .../catches/benthos/BenthosBatchUIHandler.java | 17 +++++++++-------- .../catches/species/SpeciesBatchUIHandler.java | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 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 http://git.codelutin.com/tutti.git commit 8312ade6ee2c9a5f9cc22f87378ab5cc6f53e585 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 30 11:38:48 2014 +0200 fixes #5697: [CAPTURE] mauvais affichage de // --- .../catches/benthos/BenthosBatchUIHandler.java | 17 +++++++++-------- .../catches/species/SpeciesBatchUIHandler.java | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java index 890145a..3759db0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java @@ -26,10 +26,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; -import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValues; -import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell; -import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; -import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; @@ -41,9 +37,11 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValues; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.ValidationService; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -69,8 +67,10 @@ import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentCellEditor; 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.ui.swing.util.species.SelectSpeciesUI; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; +import fr.ifremer.tutti.util.Weights; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.NumberEditor; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; @@ -87,6 +87,7 @@ import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.jdesktop.swingx.table.TableColumnExt; import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.validator.NuitonValidatorResult; import javax.swing.JComboBox; @@ -108,8 +109,8 @@ import java.util.EnumMap; import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n.t; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit@codelutin.com> @@ -1260,7 +1261,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent // Create rows in batch table model Float parentWeight = parentBatch.getFinestCategory().getNotNullWeight(); boolean subSample = parentWeight != null && totalRowWeight != null - && parentWeight > totalRowWeight; + && Weights.isGreaterWeight(parentWeight, totalRowWeight); List<BenthosBatchRowModel> newBatches = Lists.newArrayList(); for (SplitBenthosBatchRowModel row : rows) { @@ -1338,7 +1339,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent Float parentWeight = parentBatch.getSampleCategoryByIndex(categoryIndex - 1).getNotNullWeight(); boolean subSample = parentWeight != null && totalRowWeight != null - && parentWeight > totalRowWeight; + && Weights.isGreaterWeight(parentWeight, totalRowWeight); Set<BenthosBatchRowModel> shell = Sets.newHashSet(); parentBatch.collectShell(shell); @@ -1468,7 +1469,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent Float rowWeight = newRow.getFinestCategory().getNotNullWeight(); boolean subSample = rowWeight != null && childrenWeights != null - && childrenWeights < rowWeight; + && Weights.isSmallerWeight(childrenWeights, rowWeight); for (BenthosBatchRowModel childRow : batchChilds) { childRow.getFinestCategory().setSubSample(subSample); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java index 54ee37f..abef32c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java @@ -26,10 +26,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; -import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValues; -import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell; -import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; -import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; @@ -41,9 +37,11 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValues; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.ValidationService; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -68,8 +66,10 @@ import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentCellEditor; 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.ui.swing.util.species.SelectSpeciesUI; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; +import fr.ifremer.tutti.util.Weights; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.NumberEditor; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; @@ -86,6 +86,7 @@ import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.jdesktop.swingx.table.TableColumnExt; import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.validator.NuitonValidatorResult; import javax.swing.JComboBox; @@ -107,8 +108,8 @@ import java.util.EnumMap; import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n.t; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit@codelutin.com> @@ -1220,7 +1221,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec Float parentWeight = parentBatch.getFinestCategory().getNotNullWeight(); boolean subSample = parentWeight != null && totalRowWeight != null - && parentWeight > totalRowWeight; + && Weights.isGreaterWeight(parentWeight, totalRowWeight); List<SpeciesBatchRowModel> newBatches = Lists.newArrayList(); for (SplitSpeciesBatchRowModel row : rows) { if (row.isValid()) { @@ -1298,7 +1299,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec Float parentWeight = parentBatch.getSampleCategoryByIndex(categoryIndex - 1).getNotNullWeight(); boolean subSample = parentWeight != null && totalRowWeight != null - && parentWeight > totalRowWeight; + && Weights.isGreaterWeight(parentWeight, totalRowWeight); Set<SpeciesBatchRowModel> shell = Sets.newHashSet(); parentBatch.collectShell(shell); @@ -1429,7 +1430,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec Float rowWeight = newRow.getFinestCategory().getNotNullWeight(); boolean subSample = rowWeight != null && childrenWeights != null - && childrenWeights < rowWeight; + && Weights.isSmallerWeight(childrenWeights, rowWeight); for (SpeciesBatchRowModel childRow : batchChilds) { childRow.getFinestCategory().setSubSample(subSample); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm