This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit b3782c7dc154f0df1404b53eceaa6c829a3f02a1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 4 21:37:40 2015 +0200 ajout d'une option dans la configuration pour pouvoir retenter des connexions à l'ichtyomètre --- .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 4 ++++ .../main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 9 ++++++++- .../src/main/resources/i18n/tutti-persistence_en_GB.properties | 2 ++ .../src/main/resources/i18n/tutti-persistence_fr_FR.properties | 3 ++- .../ui/swing/content/actions/ConnectIchtyometerAction.java | 10 ++++++++-- .../tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 4 ++++ .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 8 files changed, 30 insertions(+), 4 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java index 7e809b3..0654ffb 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -714,6 +714,10 @@ public class TuttiConfiguration extends ApplicationConfiguration { return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.FULL_BLUETOOTH_SCAN.getKey()); } + public int getIchtyometerMaximumNumberOfAttemptToConnect() { + return applicationConfig.getOptionAsInt(TuttiConfigurationOption.ICHTYOMETER_MAXIMUM_NUMBER_OF_ATTEMPT_TO_CONNECT.getKey()); + } + public String getJavaCommandPath() { String path; String commandName = windowsOS ? "java.exe" : "java"; 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 acca259..469ae77 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -577,10 +577,17 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { ), FULL_BLUETOOTH_SCAN( "tutti.ichtyometer.fullBluetoothScan", - n("tutti.ichtyometer.fullBluetoothScan.description"), + n("tutti.config.option.ichtyometer.fullBluetoothScan.description"), "false", Boolean.class, false + ), + ICHTYOMETER_MAXIMUM_NUMBER_OF_ATTEMPT_TO_CONNECT( + "tutti.ichtyometer.maximumNumberOfAttemptToConnect", + n("tutti.config.option.ichtyometer.maximumNumberOfAttemptToConnect.description"), + "5", + int.class, + false ); /** Configuration key. */ diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties index cbfbec1..984798a 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties @@ -20,6 +20,8 @@ tutti.config.option.genericFormat.report.backup.directory.description= tutti.config.option.help.directory.description= tutti.config.option.i18n.directory.description= tutti.config.option.i18n.locale.description= +tutti.config.option.ichtyometer.fullBluetoothScan.description= +tutti.config.option.ichtyometer.maximumNumberOfAttemptToConnect.description= tutti.config.option.inceptionYear.description= tutti.config.option.launch.mode.description= tutti.config.option.organizationName.description= diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties index 49dae1d..50a5689 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties @@ -16,6 +16,8 @@ tutti.config.option.genericFormat.report.backup.directory.description=Répertoir tutti.config.option.help.directory.description=Répertoire des fichiers d'aide tutti.config.option.i18n.directory.description=Répertoire des fichiers de traductions tutti.config.option.i18n.locale.description=Langue utilisée dans l'application +tutti.config.option.ichtyometer.fullBluetoothScan.description=Pour toujours effectuer une recherche complète des périphériques bluetooth lors de la recherche d'un ichtyomètre +tutti.config.option.ichtyometer.maximumNumberOfAttemptToConnect.description=Nombre maximum de de tentatives de connection à l'ichtyomètre tutti.config.option.inceptionYear.description=Année de démarrage du projet tutti.config.option.launch.mode.description=Mode de démarrage de l'application tutti.config.option.organizationName.description=Nom de l'organisation dans la licence @@ -79,7 +81,6 @@ tutti.config.option.weight.unit.species.description=Unité de poids à utiliser tutti.config.option.weights.rate.difference.totalAndSorted.description=Pourcentage de différence entre les Poids totaux VRAC triés et les poids totaux VRAC en dessous duquel on demande confirmation sur la saisie tutti.config.parse.error=Erreur de parsing du fichier de configuration tutti.config.save.error=Erreur lors de la sauvegarde de la configuration dans le fichier %s -tutti.ichtyometer.fullBluetoothScan.description=Pour toujours effectuer une recherche complète des périphériques bluetooth lors de la recherche d'un ichtyomètre tutti.io.deleteTempDirectory.error=Erreur lors de la suppression du dossier temporaire tutti.io.mkDir.error=Erreur à la création du dossier %s tutti.persistence.attachment.copyFile.error=Erreur lors de la copie de la pièce jointe %1s dans le fichier %2s diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java index 9bc5aaa..e125fe1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java @@ -53,13 +53,19 @@ public class ConnectIchtyometerAction extends AbstractMainUITuttiAction { @Override public void doAction() throws Exception { - IchtyometerClient client = new IchtyometerClient(); + IchtyometerClient client = new IchtyometerClient(getConfig().getIchtyometerMaximumNumberOfAttemptToConnect()); RemoteDeviceChooser remoteDeviceChooser = new RemoteDeviceChooser() { @Override public String chooseRemoteDevice(Set<String> remoteDeviceNames) { + + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + // Don't care + } String selectedDevice = (String) JOptionPane.showInputDialog( - getContext().getMainUI(), + getContext().getActionUI(), t("tutti.ichtyometer.choose.remote.device.found"), t("tutti.ichtyometer.title.choose.remote.device"), JOptionPane.QUESTION_MESSAGE, 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 7479c04..54eae81 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 @@ -136,6 +136,10 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, .addOption(TuttiConfigurationOption.FULL_BLUETOOTH_SCAN) .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")) + + .addOption(TuttiConfigurationOption.SHOW_BATCH_LOG) .setOptionShortLabel(t("tutti.config.option.ui.showBatchLog.shortLabel")) diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 89bd6a9..64381e8 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -169,6 +169,7 @@ tutti.config.option.ui.dateFormat.shortLabel= tutti.config.option.ui.db.import.skipBackup.shortLabel= tutti.config.option.ui.fullBluetoothScan.shortLabel= tutti.config.option.ui.genericFormat.import.skipBackup.shortLabel= +tutti.config.option.ui.ichtyometerMaximumNumberOfAttemptToConnect.shortLabel= tutti.config.option.ui.individualObservationRowsToCreate.shortLabel= tutti.config.option.ui.showBatchLog.shortLabel= tutti.config.option.ui.showMemoryUsage.shortLabel= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 50858da..7920c88 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -151,6 +151,7 @@ tutti.config.option.ui.dateFormat.shortLabel=Format des dates tutti.config.option.ui.db.import.skipBackup.shortLabel=Ne pas faire de sauvegarde avant un import de base tutti.config.option.ui.fullBluetoothScan.shortLabel=Recherche complète des périphériques bluetooth tutti.config.option.ui.genericFormat.import.skipBackup.shortLabel=Ne pas faire de sauvegarde avant un import au format générique +tutti.config.option.ui.ichtyometerMaximumNumberOfAttemptToConnect.shortLabel=Nombre maximum de tentatives de connection à l'ichtyomètre tutti.config.option.ui.individualObservationRowsToCreate.shortLabel=Nombre max de données individuelles tutti.config.option.ui.showBatchLog.shortLabel=Voir la structure des lots dans les logs tutti.config.option.ui.showMemoryUsage.shortLabel=Voir l'utilisation de la mémoire -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.