branch release/4.4 updated (3aafb15 -> 6f5ed66)
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@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@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 6f5ed665c0c563a411ca6da5c0757f194c9f0cd4 Author: Tony CHEMIT <chemit@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@codelutin.com>.
participants (1)
-
codelutin.com scm