branch develop updated (10d996b -> 8dadcbf)
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 10d996b ne pas ajouter de ligne de mensuration en rafale quand on est en mode de recopie adds 5d0b271 on vérifie que la strate est dans les strates disponibles avant d'essayer de la retirer et de retirer ses fils. Si elle n'y est pas (ce qui arrive au lancement de l'ecran) alors on la retire pas (fixes #8055) new 0465652 Use method reference new 7feb110 Remove unused code new 8dadcbf Fixes #8055 Merge branch 'feature/8055' 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 8dadcbf8bbdd4ddb47ffcc23ab96e43c400479ae Merge: 10d996b 7feb110 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 10 15:17:44 2016 +0100 Fixes #8055 Merge branch 'feature/8055' into develop commit 7feb1103567c36d8c600847fc7ffe8655bcfa1e2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 10 15:17:30 2016 +0100 Remove unused code commit 0465652b08cdcb6916e018f4b3d6bc2408a9db1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 10 15:17:15 2016 +0100 Use method reference Summary of changes: .../content/protocol/EditProtocolUIModel.java | 16 ++++++------ .../protocol/zones/ZoneEditorUIHandler.java | 30 +++++++++++++--------- 2 files changed, 26 insertions(+), 20 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 0465652b08cdcb6916e018f4b3d6bc2408a9db1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 10 15:17:15 2016 +0100 Use method reference --- .../fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java index 6f62652..f0b6dd6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java @@ -236,7 +236,7 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, // map the cps rows by species row Multimap<EditProtocolSpeciesRowModel, CalcifiedPiecesSamplingEditorRowModel> cpsRowsBySpecies = - Multimaps.index(getCpsRows(), input -> input.getProtocolSpecies()); + Multimaps.index(getCpsRows(), CalcifiedPiecesSamplingEditorRowModel::getProtocolSpecies); // get the species protocols from the table List<SpeciesProtocol> speciesProtocols = Lists.newArrayList(); -- 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 7feb1103567c36d8c600847fc7ffe8655bcfa1e2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 10 15:17:30 2016 +0100 Remove unused code --- .../tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java index e3a6a71..b37fe1e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java @@ -56,7 +56,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collection; -import java.util.HashSet; import java.util.Optional; import java.util.stream.Collectors; @@ -362,7 +361,6 @@ public class ZoneEditorUIHandler extends AbstractTuttiUIHandler<EditProtocolUIMo .map(strata -> (StrataUIModel) strata) .collect(Collectors.toSet())); - Collection<StrataUIModel> strataToRemove = new HashSet<>(); zonesToAdd.stream() .map(ZoneUIModel::getStrata) .flatMap(Collection::stream) @@ -389,8 +387,6 @@ public class ZoneEditorUIHandler extends AbstractTuttiUIHandler<EditProtocolUIMo } }); - strataToRemove.forEach(strata -> strata.getZone().removeStrata(strata)); - zonesTreeModel.removeZones(zonesToRemove); zonesTreeModel.addZones(zonesToAdd); -- 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 8dadcbf8bbdd4ddb47ffcc23ab96e43c400479ae Merge: 10d996b 7feb110 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 10 15:17:44 2016 +0100 Fixes #8055 Merge branch 'feature/8055' into develop .../content/protocol/EditProtocolUIModel.java | 16 ++++++------ .../protocol/zones/ZoneEditorUIHandler.java | 30 +++++++++++++--------- 2 files changed, 26 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm