branch develop updated (eba83d2 -> 3886a2d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from eba83d2 Merge branch 'feature/8255' into 'develop' new 3de3001 Fix npe... Refs #8263 new 3886a2d Livrable #8263 Merge branch 'feature/8263' into develop 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 3886a2d3bfbef3fe8ff6c59e8f2c200db116bcf4 Merge: eba83d2 3de3001 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 03:21:51 2016 +0200 Livrable #8263 Merge branch 'feature/8263' into develop commit 3de30016e5ffc0ecb1365fd1e57f715e9bd83fff Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 03:21:49 2016 +0200 Fix npe... Refs #8263 Summary of changes: .../ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 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 https://gitlab.nuiton.org/codelutin/tutti.git commit 3de30016e5ffc0ecb1365fd1e57f715e9bd83fff Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 03:21:49 2016 +0200 Fix npe... Refs #8263 --- .../ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java | 4 +++- 1 file changed, 3 insertions(+), 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 45de970..58b5b02 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 @@ -166,6 +166,7 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, /** * List of the maturity pmfm ids + * * @since 4.5 */ protected List<String> maturityPmfmId; @@ -173,6 +174,7 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, /** * Map of the maturity caracteristic by id. This is what is being edited. * We do not push the maturity caracteristics directly into the editobject, this is done only when the user saves the protocol + * * @since 4.5 */ protected final LinkedHashMap<String, MaturityCaracteristic> maturityCaracteristicsById = new LinkedHashMap<>(); @@ -1344,6 +1346,6 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, } public boolean areAllMaturitiesValid() { - return maturityPmfmId.stream().allMatch(this::isMaturityValid); + return maturityPmfmId == null || maturityPmfmId.stream().allMatch(this::isMaturityValid); } } -- 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 https://gitlab.nuiton.org/codelutin/tutti.git commit 3886a2d3bfbef3fe8ff6c59e8f2c200db116bcf4 Merge: eba83d2 3de3001 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 03:21:51 2016 +0200 Livrable #8263 Merge branch 'feature/8263' into develop .../ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm