Author: tchemit Date: 2013-05-08 12:59:03 +0200 (Wed, 08 May 2013) New Revision: 928 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/928 Log: fixes #2407: [TARIT] erreur ?\195?\160 l'ouverture du trait CGFS 2010 n?\194?\176102 sur base fournie par Chistian ce jour Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java 2013-05-07 14:13:08 UTC (rev 927) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java 2013-05-08 10:59:03 UTC (rev 928) @@ -30,6 +30,7 @@ import fr.ifremer.tutti.ui.swing.content.AbstractChangeScreenAction; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionException; +import jaxx.runtime.swing.JAXXRuntimeException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -70,6 +71,10 @@ cause = cause.getCause(); } + if (cause instanceof JAXXRuntimeException) { + cause = cause.getCause(); + } + boolean backToScreen = false; AbstractTuttiAction action = null; @@ -79,6 +84,10 @@ TuttiActionException actionException = (TuttiActionException) cause; cause = cause.getCause(); + if (log.isDebugEnabled()) { + log.debug("Action error cause:", cause); + } + action = actionException.getAction(); if (action instanceof AbstractChangeScreenAction) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java 2013-05-07 14:13:08 UTC (rev 927) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java 2013-05-08 10:59:03 UTC (rev 928) @@ -91,10 +91,13 @@ error = e; throw TuttiActionException.propagateError(action, e); } finally { - if (error != null) { - action.postFailedAction(error); + try { + if (error != null) { + action.postFailedAction(error); + } + } finally { + action.releaseAction(); } - action.releaseAction(); } } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-07 14:13:08 UTC (rev 927) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-08 10:59:03 UTC (rev 928) @@ -808,6 +808,7 @@ tutti.editSpeciesBatch.action.importMultiPost.mnemonic= tutti.editSpeciesBatch.action.importMultiPost.sourceFile.button= tutti.editSpeciesBatch.action.importMultiPost.sourceFile.title= +tutti.editSpeciesBatch.action.importMultiPost.success= tutti.editSpeciesBatch.action.importMultiPost.tip= tutti.editSpeciesBatch.action.removeBatch= tutti.editSpeciesBatch.action.removeBatch.mnemonic= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-07 14:13:08 UTC (rev 927) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-08 10:59:03 UTC (rev 928) @@ -777,6 +777,7 @@ tutti.editSpeciesBatch.action.importMultiPost.mnemonic=I tutti.editSpeciesBatch.action.importMultiPost.sourceFile.button=Choisir le fichier à importer tutti.editSpeciesBatch.action.importMultiPost.sourceFile.title=Importer des lots d'espèces +tutti.editSpeciesBatch.action.importMultiPost.success= tutti.editSpeciesBatch.action.importMultiPost.tip=Importer des lots d'espèces créés sur un poste satellite tutti.editSpeciesBatch.action.removeBatch=Supprimer le lot tutti.editSpeciesBatch.action.removeBatch.mnemonic=S