Author: kmorin Date: 2014-04-29 11:14:33 +0200 (Tue, 29 Apr 2014) New Revision: 56 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/56 Log: refs #4655 [ECRAN] D?\195?\169tail d'un mail / fax correction du message d'erreur lorsque le code client est incorrect Modified: trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InvalidClientException.java trunk/faxtomail-service/src/main/resources/i18n/faxtomail-service_fr_FR.properties trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties Modified: trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties =================================================================== --- trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties 2014-04-29 09:01:07 UTC (rev 55) +++ trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties 2014-04-29 09:14:33 UTC (rev 56) @@ -2,6 +2,7 @@ faxtomail.config.option.basedir.description= faxtomail.config.option.csv.separator.description= faxtomail.config.option.data.directory.description= +faxtomail.config.option.edi.directory.description= faxtomail.config.option.i18n.directory.description= faxtomail.config.option.i18n.locale.description= faxtomail.config.option.inceptionYear.description= Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-04-29 09:01:07 UTC (rev 55) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-04-29 09:14:33 UTC (rev 56) @@ -75,6 +75,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import static org.nuiton.i18n.I18n.t; + /** * @author kmorin <kmorin@codelutin.com> * @since x.x @@ -109,9 +111,10 @@ // if client code is null, do not manage client at all if (clientCode != null) { - Client client = clientDao.forCodeEquals(clientCode).findUniqueOrNull(); + Client client = clientDao.forCodeEquals(clientCode).findAnyOrNull(); if (client == null) { - throw new InvalidClientException("Can't find client code " + clientCode); + String message = t("faxtomail.service.email.save.clientCode.error", clientCode); + throw new InvalidClientException(message); } email.setClient(client); } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InvalidClientException.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InvalidClientException.java 2014-04-29 09:01:07 UTC (rev 55) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InvalidClientException.java 2014-04-29 09:14:33 UTC (rev 56) @@ -24,8 +24,10 @@ * #L% */ -public class InvalidClientException extends Exception { +import org.nuiton.jaxx.application.ApplicationBusinessException; +public class InvalidClientException extends ApplicationBusinessException { + /** serialVersionUID. */ private static final long serialVersionUID = 1926451364755356679L; Modified: trunk/faxtomail-service/src/main/resources/i18n/faxtomail-service_fr_FR.properties =================================================================== --- trunk/faxtomail-service/src/main/resources/i18n/faxtomail-service_fr_FR.properties 2014-04-29 09:01:07 UTC (rev 55) +++ trunk/faxtomail-service/src/main/resources/i18n/faxtomail-service_fr_FR.properties 2014-04-29 09:14:33 UTC (rev 56) @@ -1,4 +1,5 @@ faxtomail.email.projectReference.default=Votre demande du %s +faxtomail.service.email.save.clientCode.error=Impossible de trouver le client %s \! faxtomail.service.referential.import.clients.error= faxtomail.service.referential.import.emailAccount.error= faxtomail.service.referential.import.emailFilter.error= Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java 2014-04-29 09:01:07 UTC (rev 55) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java 2014-04-29 09:14:33 UTC (rev 56) @@ -110,19 +110,12 @@ } public void postFailedAction(Throwable error) { - + if (error instanceof InvalidClientException) { DemandeUIModel model = getModel(); - String clientCode = model.getClientCode(); - - JOptionPane.showMessageDialog(getUI(), t("faxtomail.demande.clientCode.error", clientCode), - t("faxtomail.demandeList.title"), JOptionPane.ERROR_MESSAGE); - - // reset ui +// BeanMonitor monitor = getHandler().getMonitor(); +// String previousClientCode = (String) monitor.getOriginalValues().get(DemandeUIModel.PROPERTY_CLIENT_CODE); model.setClientCode(null); - } else { - // FIXME echatellier 20140428 how to throw original exception ? - throw new RuntimeException(error); } } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-04-29 09:01:07 UTC (rev 55) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-04-29 09:14:33 UTC (rev 56) @@ -125,8 +125,9 @@ <JLabel id='brandLabel'/> </cell> <cell weightx='1'> - <JTextField id='brandField' - onKeyReleased='handler.setText(event, "clientBrand")'/> + <!--<JTextField id='brandField'--> + <!--onKeyReleased='handler.setText(event, "clientBrand")'/>--> + <JLabel id='brandField'/> </cell> </row> <row> Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-04-29 09:01:07 UTC (rev 55) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-04-29 09:14:33 UTC (rev 56) @@ -68,7 +68,6 @@ faxtomail.demande.body.label=Corps du mail faxtomail.demande.client.label=Code client faxtomail.demande.clientBrand.label=Marque -faxtomail.demande.clientCode.error=Impossible de trouver le client %s \! faxtomail.demande.clientCode.label=Client faxtomail.demande.commandNumber.label=Numéro de commande faxtomail.demande.comment.label=Message