This is an automated email from the git hooks/post-receive script. New commit to branch feature/ajout_option_ne_pas_lire_unite in repository tutti. See http://git.codelutin.com/tutti.git commit 00496c336effa82c3e78146bcda80eb51110c46e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 3 17:00:09 2016 +0100 Permettre de ne pas lire les unités l'option est désactivée (See #7948) --- .../java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java | 12 +++++++++--- .../main/java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 7 +++++-- .../test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 7 +++++-- 3 files changed, 19 insertions(+), 7 deletions(-) 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 f56c4a8..e6b783c 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 @@ -32,6 +32,7 @@ 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; @@ -79,7 +80,7 @@ public class SoundEngine implements Closeable { public synchronized void beepOnIchtyometerErrorReception() { if (configuration.isIchtyometerErrorReceptionBeepEnabled()) { - for (int i = 0 ; i < 3 ; i++) { + for (int i = 0; i < 3; i++) { soundsToPlay.add(configuration.getIchtyometerDataReceptionBeepFrequency()); } } @@ -134,8 +135,13 @@ public class SoundEngine implements Closeable { if (log.isInfoEnabled()) { log.info("New Measure to say: " + measure); } - - SoundUtil.readNumber(measure.aroundLengthStep, measure.unit); + String unit; + if (configuration.isIchtyometerSaysUnit()) { + unit = measure.unit; + } else { + unit = null; + } + SoundUtil.readNumber(measure.aroundLengthStep, Optional.ofNullable(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 7148b4a..10975a9 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 @@ -36,6 +36,7 @@ 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) @@ -88,7 +89,7 @@ public class SoundUtil { } } - public static void readNumber(double number, String unit) { + public static void readNumber(double number, Optional<String> unit) { try { @@ -112,7 +113,9 @@ public class SoundUtil { addSound(audioInputStreams, ","); addSound(audioInputStreams, decimal); } - addSound(audioInputStreams, unit); + if (unit.isPresent()) { + addSound(audioInputStreams, unit.get()); + } if (!audioInputStreams.isEmpty()) { 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 1054ae3..2c22a7a 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 @@ -25,6 +25,8 @@ package fr.ifremer.tutti.ui.swing; import fr.ifremer.tutti.ui.swing.util.SoundUtil; import org.junit.Test; +import java.util.Optional; + /** * @author Kevin Morin (Code Lutin) * @since 4.4 @@ -42,11 +44,12 @@ public class SoundUtilTest { testReadNumber(2000, "cm"); testReadNumber(200, "cm"); testReadNumber(201, "cm"); + testReadNumber(201, null); } protected void testReadNumber(float measure, String unit) throws InterruptedException { - SoundUtil.readNumber(measure, unit); - Thread.sleep(3000); + SoundUtil.readNumber(measure, Optional.ofNullable(unit)); + Thread.sleep(1000); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.