February 2016 - Tutti-commits - mailman.cloud.codelutin.com

branch release/4.4 created (now f60776f)
by codelutin.com scm 03 Feb '16

03 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.4 in repository tutti. See http://git.codelutin.com/tutti.git at f60776f Fixes #6592 Merge branch 'feature/6592-2' into develop No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (f60776f -> 98595e5)
by codelutin.com scm 03 Feb '16

03 Feb '16

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 f60776f Fixes #6592 Merge branch 'feature/6592-2' into develop new 98595e5 [jgitflow-maven-plugin]updating poms for 4.5-SNAPSHOT development 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 98595e5fdd81b6a73a3349a28c6f7de088ad47c6 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Feb 3 19:28:51 2016 +0100 [jgitflow-maven-plugin]updating poms for 4.5-SNAPSHOT development Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (78a33c8 -> f60776f)
by codelutin.com scm 03 Feb '16

03 Feb '16

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 78a33c8 Fixes #7944 Merge branch 'feature/7944-2' into develop new 6abdc39 ajout du poids total melag importé et saisi dans le commentaire du lot (fixes #6592) new f60776f Fixes #6592 Merge branch 'feature/6592-2' 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 f60776f208e043e139554c9a58afda5b2ad8ed22 Merge: 78a33c8 6abdc39 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 3 19:23:40 2016 +0100 Fixes #6592 Merge branch 'feature/6592-2' into develop commit 6abdc3994fe9ab1ba825873d7c0015a63866b636 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 3 12:21:26 2016 +0100 ajout du poids total melag importé et saisi dans le commentaire du lot (fixes #6592) Summary of changes: .../tutti/service/pupitri/PupitriImportResult.java | 26 +++++++++++++++++++--- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../pupitri/PupitriImportServiceEvo6592Test.java | 2 +- .../species/actions/ImportPupitriAction.java | 2 +- 5 files changed, 27 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/6592-2 deleted (was 09eafe8)
by codelutin.com scm 03 Feb '16

03 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/6592-2 in repository tutti. See http://git.codelutin.com/tutti.git was 09eafe8 ajout du poids total melag importé et saisi dans le commentaire du lot (fixes #6592) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (de81b68 -> 78a33c8)
by codelutin.com scm 03 Feb '16

03 Feb '16

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 de81b68 Merge branch 'feature/ajout_option_ne_pas_lire_unite' into 'develop' new 51d69fc rtp.a en double au lieu de float pour la précision (refs #7944) new cda9442 reset the row list when the editor is initialised (fixes #7944) new 78a33c8 Fixes #7944 Merge branch 'feature/7944-2' 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 78a33c8b6a85390a1b6573347e7cb996c31bf38d Merge: de81b68 cda9442 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 3 19:20:46 2016 +0100 Fixes #7944 Merge branch 'feature/7944-2' into develop commit cda9442b7ef877cdec57b6c16424155f2d99d1bc Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 3 14:52:18 2016 +0100 reset the row list when the editor is initialised (fixes #7944) commit 51d69fcd7131f2c1054839bd084cae396174643c Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 3 14:37:12 2016 +0100 rtp.a en double au lieu de float pour la précision (refs #7944) Summary of changes: .../tutti/persistence/entities/protocol/Rtps.java | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 59339 -> 59366 bytes .../ifremer/tutti/service/protocol/SpeciesRow.java | 12 ++++++------ .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 3 ++- .../content/protocol/rtp/RtpEditorUIModel.java | 13 +++++++------ .../protocol/rtp/actions/CopyMaleRtpAction.java | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 7 files changed, 18 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

01/03: rtp.a en double au lieu de float pour la précision (refs #7944)
by codelutin.com scm 03 Feb '16

03 Feb '16

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 51d69fcd7131f2c1054839bd084cae396174643c Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 3 14:37:12 2016 +0100 rtp.a en double au lieu de float pour la précision (refs #7944) --- .../tutti/persistence/entities/protocol/Rtps.java | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 59339 -> 59366 bytes .../ifremer/tutti/service/protocol/SpeciesRow.java | 12 ++++++------ .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 3 ++- .../content/protocol/rtp/RtpEditorUIModel.java | 12 ++++++------ .../protocol/rtp/actions/CopyMaleRtpAction.java | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Rtps.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Rtps.java index 81b4048..2ee8181 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Rtps.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Rtps.java @@ -26,7 +26,7 @@ package fr.ifremer.tutti.persistence.entities.protocol; public class Rtps extends AbstractRtps { - public static Rtp newRtp(float a, float b) { + public static Rtp newRtp(double a, float b) { Rtp rtp = newRtp(); rtp.setA(a); rtp.setB(b); diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index 1545a4d..a6e2a4d 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java index 4ccba57..59a9aa6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java @@ -253,7 +253,7 @@ public class SpeciesRow implements Serializable { delegate.setRtpUndefined(rtpUndefined); } - public Float getRtpMaleA() { + public Double getRtpMaleA() { return withRtpMale() ? getRtpMale().getA() : null; } @@ -261,7 +261,7 @@ public class SpeciesRow implements Serializable { return withRtpMale() ? getRtpMale().getB() : null; } - public Float getRtpFemaleA() { + public Double getRtpFemaleA() { return withRtpFemale() ? getRtpFemale().getA() : null; } @@ -269,7 +269,7 @@ public class SpeciesRow implements Serializable { return withRtpFemale() ? getRtpFemale().getB() : null; } - public Float getRtpUndefinedA() { + public Double getRtpUndefinedA() { return withRtpUndefined() ? getRtpUndefined().getA() : null; } @@ -277,7 +277,7 @@ public class SpeciesRow implements Serializable { return withRtpUndefined() ? getRtpUndefined().getB() : null; } - public void setRtpMaleA(Float a) { + public void setRtpMaleA(Double a) { getRtpMale().setA(a); } @@ -285,7 +285,7 @@ public class SpeciesRow implements Serializable { getRtpMale().setB(b); } - public void setRtpFemaleA(Float a) { + public void setRtpFemaleA(Double a) { getRtpFemale().setA(a); } @@ -293,7 +293,7 @@ public class SpeciesRow implements Serializable { getRtpFemale().setB(b); } - public void setRtpUndefinedA(Float a) { + public void setRtpUndefinedA(Double a) { getRtpUndefined().setA(a); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss index 9bef8f9..51d4a55 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss @@ -4,15 +4,16 @@ NumberEditor { showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; bean: {model}; showReset: true; - numberType: {Float.class}; _selectOnFocus: {true}; } .aEditor { + numberType: {Double.class}; numberPattern: {DECIMAL9_PATTERN}; } .bEditor { + numberType: {Float.class}; numberPattern: {DECIMAL4_PATTERN}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java index cc2981b..5eb564d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java @@ -97,11 +97,11 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci return rtpFemale; } - public Float getRtpMaleA() { + public Double getRtpMaleA() { return rtpMale.getA(); } - public void setRtpMaleA(Float a) { + public void setRtpMaleA(Double a) { rtpMale.setA(a); firePropertyChanged(PROPERTY_RTP_MALE_A, null, a); } @@ -115,11 +115,11 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci firePropertyChanged(PROPERTY_RTP_MALE_B, null, b); } - public Float getRtpFemaleA() { + public Double getRtpFemaleA() { return rtpFemale.getA(); } - public void setRtpFemaleA(Float a) { + public void setRtpFemaleA(Double a) { rtpFemale.setA(a); firePropertyChanged(PROPERTY_RTP_FEMALE_A, null, a); } @@ -133,11 +133,11 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci firePropertyChanged(PROPERTY_RTP_FEMALE_B, null, b); } - public Float getRtpUndefinedA() { + public Double getRtpUndefinedA() { return rtpUndefined.getA(); } - public void setRtpUndefinedA(Float a) { + public void setRtpUndefinedA(Double a) { rtpUndefined.setA(a); firePropertyChanged(PROPERTY_RTP_UNDEFINED_A, null, a); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java index 01cc974..5f4443c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java @@ -42,7 +42,7 @@ public class CopyMaleRtpAction extends SimpleActionSupport<RtpEditorUI> { protected void onActionPerformed(RtpEditorUI rtpEditorUI) { RtpEditorUIModel model = rtpEditorUI.getModel(); - Float rtpMaleA = model.getRtpMaleA(); + Double rtpMaleA = model.getRtpMaleA(); model.setRtpFemaleA(rtpMaleA); model.setRtpUndefinedA(rtpMaleA); diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 3d5165a..6b35ea6 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1112,7 +1112,7 @@ tutti.editRtp.field.rtpUndefinedA.tip=Paramètre A tutti.editRtp.field.rtpUndefinedB=B tutti.editRtp.field.rtpUndefinedB.tip=Paramètre B tutti.editRtp.malePanel=Mâle -tutti.editRtp.tooltip=<ul><li>Mâle \: a \: %1$s - b \: %2$s</li><li>Femelle \: a \: %1$s - b \: %2$s</li><li>Inconnu \: a \: %1$s - b \: %2$s</li></ul> +tutti.editRtp.tooltip=<ul><li>Mâle \: a \: %1$s - b \: %2$s</li><li>Femelle \: a \: %3$s - b \: %4$s</li><li>Inconnu \: a \: %5$s - b \: %6$s</li></ul> tutti.editRtp.undefinedPanel=Sexe inconnu tutti.editRtp.withRtp.tip=RTP renseignés tutti.editRtp.withoutRtp.tip=RTP non renseignés -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7944-2 deleted (was aa0ac85)
by codelutin.com scm 03 Feb '16

03 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7944-2 in repository tutti. See http://git.codelutin.com/tutti.git was aa0ac85 reset the row list when the editor is initialised (fixes #7944) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7930 created (now c282fc6)
by codelutin.com scm 03 Feb '16

03 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7930 in repository tutti. See http://git.codelutin.com/tutti.git at c282fc6 creation de l'onglet d'edition de l'algo de prelevement de pieces calcifiees (refs #7930) This branch includes the following new commits: new c282fc6 creation de l'onglet d'edition de l'algo de prelevement de pieces calcifiees (refs #7930) 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 c282fc6a5b1f02a37e6628e1e6130a11f5b32319 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 3 18:05:33 2016 +0100 creation de l'onglet d'edition de l'algo de prelevement de pieces calcifiees (refs #7930) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (3a73396 -> de81b68)
by codelutin.com scm 03 Feb '16

03 Feb '16

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 3a73396 Merge branch 'feature/7946' into 'develop' adds b740291 Ajout de l'option dans la configuration pour dicter ou non les unités (See #7948) adds 00496c3 Permettre de ne pas lire les unités l'option est désactivée (See #7948) adds 95579a0 modif du nom de la conf adds de81b68 Merge branch 'feature/ajout_option_ne_pas_lire_unite' into 'develop' No new revisions were added by this update. Summary of changes: .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 4 ++++ .../main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 7 +++++++ .../main/resources/i18n/tutti-persistence_en_GB.properties | 1 + .../main/resources/i18n/tutti-persistence_fr_FR.properties | 1 + .../tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 4 ++++ .../java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java | 12 +++++++++--- .../main/java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 7 +++++-- .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + .../test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 7 +++++-- 10 files changed, 38 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/ajout_option_ne_pas_lire_unite updated (00496c3 -> 95579a0)
by codelutin.com scm 03 Feb '16

03 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/ajout_option_ne_pas_lire_unite in repository tutti. See http://git.codelutin.com/tutti.git from 00496c3 Permettre de ne pas lire les unités l'option est désactivée (See #7948) adds 95579a0 modif du nom de la conf No new revisions were added by this update. Summary of changes: .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 4 ++-- .../src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 6 +++--- .../src/main/resources/i18n/tutti-persistence_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-persistence_fr_FR.properties | 2 +- .../ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 4 ++-- .../src/main/java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java | 2 +- .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 8 files changed, 12 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0