This is an automated email from the git hooks/post-receive script. New commit to branch feature/7459 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 01a9569cad51fedb6124178988bffe58e22e72fa Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 14:00:44 2016 +0200 Meilleure gestion de l'erreur de connection au pied à coulisse (See #7459) --- .../tutti/ui/swing/content/actions/ConnectCaliperAction.java | 10 +++++++++- .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectCaliperAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectCaliperAction.java index e0ea92c..9a63cea 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectCaliperAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectCaliperAction.java @@ -22,8 +22,10 @@ package fr.ifremer.tutti.ui.swing.content.actions; * #L% */ +import fr.ifremer.tutti.caliper.feed.CaliperConnectionException; import fr.ifremer.tutti.caliper.feed.CaliperFeedReader; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; +import org.nuiton.jaxx.application.ApplicationBusinessException; import static org.nuiton.i18n.I18n.t; @@ -45,7 +47,13 @@ public class ConnectCaliperAction extends AbstractMainUITuttiAction { public void doAction() throws Exception { CaliperFeedReader caliperReader = new CaliperFeedReader(); - caliperReader.start(getConfig().getCaliperSerialPort()); + + int caliperSerialPort = getConfig().getCaliperSerialPort(); + try { + caliperReader.start(caliperSerialPort); + } catch (CaliperConnectionException e) { + throw new ApplicationBusinessException(t("tutti.caliper.connection.error", caliperSerialPort, e.getMessage())); + } getContext().setCaliperReader(caliperReader); } 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 9722252..6289320 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 @@ -90,6 +90,7 @@ tutti.attachmentEditor.saveAttachment.title= tutti.attachmentEditor.simpleText= tutti.attachmentEditor.text= tutti.attachmentEditor.title= +tutti.caliper.connection.error= tutti.caliper.connection.establish= tutti.caliper.connection.establish.message= tutti.caliper.connection.establish.title= 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 dcb5904..bbcdcc2 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 @@ -72,6 +72,7 @@ tutti.attachmentEditor.saveAttachment.title=Enregistrer la pièce-jointe tutti.attachmentEditor.simpleText=Pièce(s) jointe(s) tutti.attachmentEditor.text=(%s) tutti.attachmentEditor.title=Pièces jointes +tutti.caliper.connection.error=<html><body>Impossible de se connecter au pied à coulisse établie sur le port <strong>COM%s</strong> pour la raison suivante<br/><pre>%s</pre></body></html> tutti.caliper.connection.establish=Connexion au pied à coulisse établie sur le port <strong>%s</strong> tutti.caliper.connection.establish.message=<html><body>La connexion au pied à coulisse est établie sur le port <strong>%s</strong>.</body></html> tutti.caliper.connection.establish.title=Connexion établie -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.