From tchemit@users.forge.codelutin.com Wed May 22 10:42:35 2013 From: tchemit@users.forge.codelutin.com To: tutti-commits@list.forge.codelutin.com Subject: [Tutti-commits] r978 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/util resources/i18n Date: Wed, 22 May 2013 10:42:35 +0200 Message-ID: <20130522084235.C810D1582F@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5568512547240903712==" --===============5568512547240903712== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: tchemit Date: 2013-05-22 10:42:35 +0200 (Wed, 22 May 2013) New Revision: 978 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/978 Log: fixes #2473: [TECHN] Message indiquant que le serveur de MAJ n'est pas dispo possibilite d'utiliser du html dans les businessException messages Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErr= orHelper.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIU= til.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properti= es Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/T= uttiErrorHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiEr= rorHelper.java 2013-05-22 08:23:24 UTC (rev 977) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiEr= rorHelper.java 2013-05-22 08:42:35 UTC (rev 978) @@ -57,11 +57,11 @@ public void showErrorDialog(String message, Throwable cause) { =20 if (cause =3D=3D null) { - JOptionPane.showMessageDialog(context.getMainUI(), message, + JOptionPane.showMessageDialog(context.getMainUI(), "= "+message+"", _("tutti.error.ui.business.error"), JOptionPane.ERROR_MESSAGE); } else if (cause instanceof TuttiBusinessException) { - JOptionPane.showMessageDialog(context.getMainUI(), cause.getMess= age(), + JOptionPane.showMessageDialog(context.getMainUI(), "= "+cause.getMessage()+"", _("tutti.error.ui.business.error"), JOptionPane.ERROR_MESSAGE); } else { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/T= uttiUIUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI= Util.java 2013-05-22 08:23:24 UTC (rev 977) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI= Util.java 2013-05-22 08:42:35 UTC (rev 978) @@ -357,9 +357,9 @@ public static void tryToConnectToUpdateUrl(String url, String i18nKey) { try { URLConnection urlConnection =3D new URL(url).openConnection(); - urlConnection.setConnectTimeout(5000); + urlConnection.setConnectTimeout(10000); urlConnection.connect(); - } catch (IOException e) { + } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Could not connect to " + url, e); } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.p= roperties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.propert= ies 2013-05-22 08:23:24 UTC (rev 977) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.propert= ies 2013-05-22 08:42:35 UTC (rev 978) @@ -902,11 +902,11 @@ tutti.editSpeciesFrequencies.table.header.number=3DNombre tutti.editSpeciesFrequencies.table.header.weight=3DPoids observ=C3=A9 (kg) tutti.editSpeciesFrequencies.title=3DMensuration -tutti.error.about.could.not.reach.url=3DR=C3=A9cup=C3=A9ration des versions = de mises =C3=A0 jour impossible (l'url %s n'est pas joignable) +tutti.error.about.could.not.reach.url=3DR=C3=A9cup=C3=A9ration des versions = de mises =C3=A0 jour impossible (l'url %s n'est pas joignabl= e) tutti.error.errorpane.htmlmessage=3DUne erreur s'est produite= \:
%s tutti.error.ui.business.error=3DErreur tutti.error.ui.other.error=3DErreur -tutti.error.update.could.not.reach.url=3DMise =C3=A0 jour impossible (l'url = %s n'est pas joignable) +tutti.error.update.could.not.reach.url=3DMise =C3=A0 jour impossible (l'url = %s n'est pas joignable) tutti.exportCruise.action.success=3DLa campagne %s a =C3=A9= t=C3=A9 export=C3=A9e dans le fichier %s. tutti.exportCruiseForSumatra.action.chooseFile=3DChoisir le fichier d'export tutti.exportCruiseForSumatra.action.success=3DLes captures ont correctement = =C3=A9t=C3=A9 export=C3=A9 dans le fichier %s --===============5568512547240903712==--