Author: echatellier Date: 2014-04-29 10:51:47 +0200 (Tue, 29 Apr 2014) New Revision: 54 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/54 Log: refs #4657: Fix compilation 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/InitFaxToMailService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java 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-28 17:59:52 UTC (rev 53) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-04-29 08:51:47 UTC (rev 54) @@ -88,6 +88,19 @@ return email; } + /** + * Save email with default email client code. + * + * @param email email + * @param user user + * @param modifiedFields modified fields + * @return updated email instance + * @throws InvalidClientException if client code is not valid + */ + public Email saveEmail(Email email, FaxToMailUser user, String... modifiedFields) throws InvalidClientException { + return saveEmail(email, email.getClient().getCode(), user, modifiedFields); + } + public Email saveEmail(Email email, String clientCode, FaxToMailUser user, String... modifiedFields) throws InvalidClientException { Date now = getNow(); ClientTopiaDao clientDao = getPersistenceContext().getClientDao(); @@ -449,7 +462,7 @@ History.PROPERTY_MODIFICATION_DATE, now); email.addHistory(history); - email = saveEmail(email, email.getClient().getCode(), user); + email = saveEmail(email, user); } catch (Exception e) { if (log.isErrorEnabled()) { Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-04-28 17:59:52 UTC (rev 53) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-04-29 08:51:47 UTC (rev 54) @@ -418,7 +418,7 @@ email.setDemandType(types.get(random.nextInt(types.size()))); email.setPriority(priorities.get(random.nextInt(priorities.size()))); email.setRangeRow(rangeRows); - getEmailService().saveEmail(email, email.getClient().getCode(), user, + getEmailService().saveEmail(email, user, Email.PROPERTY_DEMAND_TYPE, Email.PROPERTY_PRIORITY, Email.PROPERTY_RANGE_ROW); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java 2014-04-28 17:59:52 UTC (rev 53) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java 2014-04-29 08:51:47 UTC (rev 54) @@ -60,7 +60,7 @@ FaxToMailUser currentUser = context.getCurrentUser(); Email email = model.toEntity(persistedEmail); - email = context.getEmailService().saveEmail(email, email.getClient().getCode(), currentUser, modifiedProperties); + email = context.getEmailService().saveEmail(email, currentUser, modifiedProperties); model.fromEntity(email); } }