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

[ANN] - Tutti 4.4 released
by codelutin.com Release Notification 04 Feb '16

04 Feb '16

The Tutti team is pleased to announce the tutti-4.4 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: https://tutti.codelutin.com Changes ------- Changes in this version include: New features: o [PROTOCOLE] précision des valeurs dans les RTP Issue: 7944. Thanks to Kevin Morin. Resolved by kmorin. o [CAPTURE] Garder une trace du poids de melag importé lors de l'import pupitri Issue: 7960. Thanks to Kevin Morin. Resolved by kmorin. Fixed Bugs: o Connexion Ichtyomètre impossible : erreur Issue: 7947. Thanks to Vincent BADTS. Resolved by kmorin. o Erreur à analyser : lancement 4.4. RC3 Issue: 7946. Thanks to Vincent BADTS. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-4.4-full-linux-i586.zip - https://forge.codelutin.com/attachments/download/3671 * tutti-4.4-full-windows-i586.zip - https://forge.codelutin.com/attachments/download/3672 * tutti-ichtyometer-4.4-tools.zip - https://forge.codelutin.com/attachments/download/3673 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

branch release/4.4 deleted (was 867dfc2)
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 was 867dfc2 [jgitflow-maven-plugin]updating poms for branch'release/4.4' with non-snapshot versions 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

annotated tag tutti-4.4 created (now 8af67b4)
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 annotated tag tutti-4.4 in repository tutti. See http://git.codelutin.com/tutti.git at 8af67b4 (tag) tagging 1c18a9eb17d67252270b5603d3a717522c82bbd5 (commit) replaces tutti-4.4-rc3 tagged by Maven Release on Wed Feb 3 22:48:55 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.4 ----------------------------------------------------------------------- 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 release/4.4 updated (6f5ed66 -> 867dfc2)
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 from 6f5ed66 on reste sur java 7 le temps que maven-release l'est :( adds 867dfc2 [jgitflow-maven-plugin]updating poms for branch'release/4.4' with non-snapshot versions No new revisions were added by this update. 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 0

branch master updated (ab52755 -> 1c18a9e)
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 master in repository tutti. See http://git.codelutin.com/tutti.git from ab52755 [jgitflow-maven-plugin]merging 'release/4.4-rc3' into 'master' adds 8385cdd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 24a97b1 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 6c0822a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 320a3a0 Trim update url, because of haw theroy... (See #7946) adds 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' adds 51d69fc rtp.a en double au lieu de float pour la précision (refs #7944) adds cda9442 reset the row list when the editor is initialised (fixes #7944) adds 78a33c8 Fixes #7944 Merge branch 'feature/7944-2' into develop adds 6abdc39 ajout du poids total melag importé et saisi dans le commentaire du lot (fixes #6592) adds f60776f Fixes #6592 Merge branch 'feature/6592-2' into develop adds 6f5ed66 on reste sur java 7 le temps que maven-release l'est :( adds 867dfc2 [jgitflow-maven-plugin]updating poms for branch'release/4.4' with non-snapshot versions adds 1c18a9e [jgitflow-maven-plugin]merging 'release/4.4' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 10 ++++++-- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 ++++++ .../tutti/persistence/entities/protocol/Rtps.java | 2 +- .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../src/main/xmi/tutti-persistence.zargo | Bin 59339 -> 59366 bytes tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/protocol/SpeciesRow.java | 12 +++++----- .../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 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 4 ++++ .../species/actions/ImportPupitriAction.java | 2 +- .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 3 ++- .../content/protocol/rtp/RtpEditorUIModel.java | 13 ++++++----- .../protocol/rtp/actions/CopyMaleRtpAction.java | 2 +- .../ifremer/tutti/ui/swing/util/SoundEngine.java | 12 +++++++--- .../fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 15 +++++++----- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 ++- .../fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 8 +++++-- 28 files changed, 99 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (98595e5 -> 833a487)
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 98595e5 [jgitflow-maven-plugin]updating poms for 4.5-SNAPSHOT development new 17ca764 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6f5ed66 on reste sur java 7 le temps que maven-release l'est :( new 867dfc2 [jgitflow-maven-plugin]updating poms for branch'release/4.4' with non-snapshot versions new 1c18a9e [jgitflow-maven-plugin]merging 'release/4.4' into 'master' new 517f70b [jgitflow-maven-plugin]merging 'master' into 'develop' new 833a487 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 833a48714f1577032a6d7227ef258ba006e1331f Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Feb 3 22:49:03 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 517f70b790c7378c119bc8d08b4bd7f2f589cb9e Merge: 17ca764 1c18a9e Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Feb 3 22:49:01 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 17ca764c1099848b76bbd489e76724c307967aa6 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Feb 3 22:49:00 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 1c18a9eb17d67252270b5603d3a717522c82bbd5 Merge: ab52755 867dfc2 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Feb 3 22:48:55 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4' into 'master' commit 867dfc2d73f2e8dfd9eae28725d2223af8994923 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Feb 3 22:32:25 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4' with non-snapshot versions Summary of changes: .../src/main/resources/i18n/tutti-service_fr_FR.properties | 2 +- .../main/java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java | 4 ++-- .../main/java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 10 +++++----- .../src/test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 5 +++-- 4 files changed, 11 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

[ANN] - Tutti 4.4 released
by codelutin.com Release Notification 03 Feb '16

03 Feb '16

The Tutti team is pleased to announce the tutti-4.4 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: https://tutti.codelutin.com Changes ------- Changes in this version include: New features: o [PROTOCOLE] précision des valeurs dans les RTP Issue: 7944. Thanks to Kevin Morin. Resolved by kmorin. o [CAPTURE] Garder une trace du poids de melag importé lors de l'import pupitri Issue: 7960. Thanks to Kevin Morin. Resolved by kmorin. Fixed Bugs: o Connexion Ichtyomètre impossible : erreur Issue: 7947. Thanks to Vincent BADTS. Resolved by kmorin. o Erreur à analyser : lancement 4.4. RC3 Issue: 7946. Thanks to Vincent BADTS. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-4.4-full-linux-i586.zip - https://forge.codelutin.com/attachments/download/3668 * tutti-4.4-full-windows-i586.zip - https://forge.codelutin.com/attachments/download/3669 * tutti-ichtyometer-4.4-tools.zip - https://forge.codelutin.com/attachments/download/3670 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

01/01: on reste sur java 7 le temps que maven-release l'est :(
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 release/4.4 in repository tutti. See http://git.codelutin.com/tutti.git commit 6f5ed665c0c563a411ca6da5c0757f194c9f0cd4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 3 22:22:01 2016 +0100 on reste sur java 7 le temps que maven-release l'est :( --- .../src/main/resources/i18n/tutti-service_fr_FR.properties | 2 +- .../main/java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java | 4 ++-- .../main/java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 10 +++++----- .../src/test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 5 +++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties index a267035..76332e6 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties @@ -308,7 +308,7 @@ tutti.service.pupitri.import.carrousel.error=Erreur lors de l'import du fichier tutti.service.pupitri.import.createMelag.comment.part1=Traitement issu d'un mélange composé de \: tutti.service.pupitri.import.createMelag.comment.part2=- %s%s de %s tutti.service.pupitri.import.createMelag.comment.part3=avec un poids d'élévation de %s%s -tutti.service.pupitri.import.createMelag.comment.part4=poids d'élévation modifié à l'import : valeur importée \= %s%s, valeur saisie \= %s%s +tutti.service.pupitri.import.createMelag.comment.part4=poids d'élévation modifié à l'import \: valeur importée \= %s%s, valeur saisie \= %s%s tutti.service.pupitri.import.trunk.error=Erreur lors de l'import du fichier de trémie %2s pour le trait %1s tutti.service.referential.export.gear.error=Erreur lors de l'export des engins dans le fichier %s tutti.service.referential.export.person.error=Erreur lors de l'export des personnes dans le fichier %s diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java index 4cd6036..a3f150a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java @@ -25,6 +25,7 @@ package fr.ifremer.tutti.ui.swing.util; */ import com.google.common.base.MoreObjects; +import com.google.common.base.Optional; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.util.BeepFrequency; import org.apache.commons.logging.Log; @@ -32,7 +33,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationTechnicalException; import java.io.Closeable; -import java.util.Optional; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; @@ -141,7 +141,7 @@ public class SoundEngine implements Closeable { } else { unit = null; } - SoundUtil.readNumber(measure.aroundLengthStep, Optional.ofNullable(unit)); + SoundUtil.readNumber(measure.aroundLengthStep, Optional.fromNullable(unit)); } else if (sound instanceof BeepFrequency) { SoundUtil.beep(configuration.getIchtyometerErrorReceptionBeepFrequency()); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java index 10975a9..b14cc6a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java @@ -22,6 +22,7 @@ package fr.ifremer.tutti.ui.swing.util; * #L% */ +import com.google.common.base.Optional; import fr.ifremer.tutti.util.BeepFrequency; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -36,7 +37,6 @@ import javax.sound.sampled.UnsupportedAudioFileException; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Optional; /** * @author Kevin Morin (Code Lutin) @@ -72,10 +72,10 @@ public class SoundUtil { public static void tone(int hz, int msecs, double vol) throws LineUnavailableException { byte[] buf = new byte[1]; AudioFormat af = new AudioFormat(SAMPLE_RATE, // sampleRate - 8, // sampleSizeInBits - 1, // channels - true, // signed - false); // bigEndian + 8, // sampleSizeInBits + 1, // channels + true, // signed + false); // bigEndian try (SourceDataLine sdl = AudioSystem.getSourceDataLine(af)) { sdl.open(af); sdl.start(); diff --git a/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java b/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java index 2c22a7a..7813547 100644 --- a/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java +++ b/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java @@ -22,10 +22,11 @@ package fr.ifremer.tutti.ui.swing; * #L% */ +import com.google.common.base.Optional; import fr.ifremer.tutti.ui.swing.util.SoundUtil; import org.junit.Test; -import java.util.Optional; + /** * @author Kevin Morin (Code Lutin) @@ -49,7 +50,7 @@ public class SoundUtilTest { protected void testReadNumber(float measure, String unit) throws InterruptedException { - SoundUtil.readNumber(measure, Optional.ofNullable(unit)); + SoundUtil.readNumber(measure, Optional.fromNullable(unit)); Thread.sleep(1000); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/4.4 updated (3aafb15 -> 6f5ed66)
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 discards 3aafb15 on reste sur java 7 le temps que maven-release l'est :( new 6f5ed66 on reste sur java 7 le temps que maven-release l'est :( This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3aafb15) \ N -- N -- N refs/heads/release/4.4 (6f5ed66) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. 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 6f5ed665c0c563a411ca6da5c0757f194c9f0cd4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 3 22:22:01 2016 +0100 on reste sur java 7 le temps que maven-release l'est :( Summary of changes: .../src/test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/4.4 updated (f60776f -> 3aafb15)
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 from f60776f Fixes #6592 Merge branch 'feature/6592-2' into develop new 3aafb15 on reste sur java 7 le temps que maven-release l'est :( 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 3aafb15df2ce5897064a135d452b357b9a2d9395 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 3 22:06:15 2016 +0100 on reste sur java 7 le temps que maven-release l'est :( Summary of changes: .../src/main/resources/i18n/tutti-service_fr_FR.properties | 2 +- .../main/java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java | 4 ++-- .../main/java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1