branch release/4.4 updated (f60776f -> 3aafb15)
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@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@codelutin.com>.
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 3aafb15df2ce5897064a135d452b357b9a2d9395 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 3 22:06:15 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 +++++----- 3 files changed, 8 insertions(+), 8 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(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm