This is an automated email from the git hooks/post-receive script. New commit to branch feature/8033 in repository tutti. See http://git.codelutin.com/tutti.git commit 608eee40da45127b4eaf7bfc9f74b451d8b47966 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 1 16:56:03 2016 +0100 Changement du comparateur de lignes de l'éditeur de prélèvement des pièces calcifiées (See #8033) --- .../CalcifiedPiecesSamplingEditorRowModel.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorRowModel.java index c57e3ae..33741e4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorRowModel.java @@ -70,14 +70,10 @@ public class CalcifiedPiecesSamplingEditorRowModel extends AbstractTuttiBeanUIMo return speciesDecorator.toString(species1).compareTo(speciesDecorator.toString(species2)); } - if (o1.getMaturity() == null && o2.getMaturity() != null) { - return -1; + boolean withMaturity = o1.getMaturity() != null; - } else if (o1.getMaturity() != null && o2.getMaturity() == null) { - return 1; - - } else if (o1.getMaturity() != null && !o1.getMaturity().equals(o2.getMaturity())) { - return o1.getMaturity() ? -1 : 1; + if (withMaturity && !o1.getMaturity().equals(o2.getMaturity())) { + return o1.getMaturity() ? 1 : -1; } return o1.getMinSize() - o2.getMinSize(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.