branch feature/8033 created (now 608eee4)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8033 in repository tutti. See http://git.codelutin.com/tutti.git at 608eee4 Changement du comparateur de lignes de l'éditeur de prélèvement des pièces calcifiées (See #8033) This branch includes the following new commits: new 7250846 Changement de l'ordre d'insertion des lignes (See #8033) new 608eee4 Changement du comparateur de lignes de l'éditeur de prélèvement des pièces calcifiées (See #8033) The 2 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 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) commit 7250846a3d78139b681826abf03aeda91cb3c9db Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 1 16:43:44 2016 +0100 Changement de l'ordre d'insertion des lignes (See #8033) -- 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 feature/8033 in repository tutti. See http://git.codelutin.com/tutti.git commit 7250846a3d78139b681826abf03aeda91cb3c9db Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 1 16:43:44 2016 +0100 Changement de l'ordre d'insertion des lignes (See #8033) --- .../calcifiedpiecessampling/actions/AddSpeciesAction.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/AddSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/AddSpeciesAction.java index 02101b0..e36ae24 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/AddSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/AddSpeciesAction.java @@ -58,15 +58,17 @@ public class AddSpeciesAction extends SimpleActionSupport<CalcifiedPiecesSamplin List<CalcifiedPiecesSamplingEditorRowModel> newRows = new ArrayList<>(); if (ui.getMaturityCheckBox().isSelected()) { - CalcifiedPiecesSamplingEditorRowModel newRow = ui.getHandler().createNewRow(species, true); - newRows.add(newRow); + CalcifiedPiecesSamplingEditorRowModel immatureRow = ui.getHandler().createNewRow(species, false); + newRows.add(immatureRow); - newRow = ui.getHandler().createNewRow(species, false); - newRows.add(newRow); + CalcifiedPiecesSamplingEditorRowModel matureRow = ui.getHandler().createNewRow(species, true); + newRows.add(matureRow); } else { + CalcifiedPiecesSamplingEditorRowModel newRow = ui.getHandler().createNewRow(species, null); newRows.add(newRow); + } List<CalcifiedPiecesSamplingEditorRowModel> cpsRows = ui.getModel().getCpsRows(); -- 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 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>.
participants (1)
-
codelutin.com scm