This is an automated email from the git hooks/post-receive script. New commit to branch feature/7063 in repository tutti. See http://git.codelutin.com/tutti.git commit c8c6ee9120d12a528882a57fcbb9bd23376246cf Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 13 19:58:12 2016 +0100 ajout de la tonalité nulle dans la conf (refs #7063) --- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 4 ++-- .../main/java/fr/ifremer/tutti/util/BeepFrequency.java | 4 ++-- .../ui/swing/content/config/TuttiConfigUIHandler.java | 11 +++++++++-- .../java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 18 +++++++++++------- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java index 836d2d9..5b478f8 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -608,14 +608,14 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { ICHTYOMETER_DATA_RECEPTION_BEEP_FREQUENCY( "tutti.ichtyometer.dataBeepFrequency", n("tutti.config.option.dataBeepFrequency.description"), - BeepFrequency.A2.toString(), + null, BeepFrequency.class, false ), ICHTYOMETER_ERROR_RECEPTION_BEEP_FREQUENCY( "tutti.ichtyometer.errorBeepFrequency", n("tutti.config.option.errorBeepFrequency.description"), - BeepFrequency.A1.toString(), + null, BeepFrequency.class, false ); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/BeepFrequency.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/BeepFrequency.java index c298836..e2b3e68 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/BeepFrequency.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/BeepFrequency.java @@ -21,13 +21,13 @@ public enum BeepFrequency { F2(2793), G2(3135); - private int frequency; + private final int frequency; BeepFrequency(int frequency) { this.frequency = frequency; } - public int getFrequency() { + public Integer getFrequency() { return frequency; } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java index 2af8379..1d6668d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java @@ -31,6 +31,7 @@ import fr.ifremer.tutti.ui.swing.content.config.actions.ReloadTuttiAction; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.editor.TuttiLocationTableCell; import fr.ifremer.tutti.ui.swing.util.editor.VesselTableCell; +import fr.ifremer.tutti.util.BeepFrequency; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.config.ConfigCategoryUI; import jaxx.runtime.swing.config.ConfigUI; @@ -138,13 +139,19 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, .setOptionShortLabel(t("tutti.config.option.ui.fullBluetoothScan.shortLabel")) .addOption(TuttiConfigurationOption.ICHTYOMETER_MAXIMUM_NUMBER_OF_ATTEMPT_TO_CONNECT) - .setOptionShortLabel(t("tutti.config.option.ui.ichtyometerMaximumNumberOfAttemptToConnect.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.ui.ichtyometerMaximumNumberOfAttemptToConnect.shortLabel")); - .addOption(TuttiConfigurationOption.ICHTYOMETER_DATA_RECEPTION_BEEP_FREQUENCY) + EnumEditor<BeepFrequency> beepFrequencyEnumEditor = EnumEditor.newEditor(BeepFrequency.class); + beepFrequencyEnumEditor.insertItemAt(null, 0); + DefaultCellEditor beepFrequencyUnitTableCellEditor = new DefaultCellEditor(beepFrequencyEnumEditor); + + helper.addOption(TuttiConfigurationOption.ICHTYOMETER_DATA_RECEPTION_BEEP_FREQUENCY) .setOptionShortLabel(t("tutti.config.option.ui.ichtyometerDataBeepFrequency.shortLabel")) + .setOptionEditor(beepFrequencyUnitTableCellEditor) .addOption(TuttiConfigurationOption.ICHTYOMETER_ERROR_RECEPTION_BEEP_FREQUENCY) .setOptionShortLabel(t("tutti.config.option.ui.ichtyometerErrorBeepFrequency.shortLabel")) + .setOptionEditor(beepFrequencyUnitTableCellEditor) .addOption(TuttiConfigurationOption.SHOW_BATCH_LOG) .setOptionShortLabel(t("tutti.config.option.ui.showBatchLog.shortLabel")) 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 b4ef694..c63bb26 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 @@ -25,14 +25,18 @@ public class SoundUtil { } public static void beep(BeepFrequency beepFrequency, int number) { - try { - for (int i = 0; i < number; i++) { - tone(beepFrequency.getFrequency(), 500, 1.0); - } + + if (beepFrequency != null) { + + try { + for (int i = 0; i < number; i++) { + tone(beepFrequency.getFrequency(), 500, 1.0); + } - } catch (LineUnavailableException e) { - if (log.isErrorEnabled()) { - log.error("Error while playing a beep", e); + } catch (LineUnavailableException e) { + if (log.isErrorEnabled()) { + log.error("Error while playing a beep", e); + } } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.