June 2014 - Faxtomail-commits - mailman.cloud.codelutin.com

r241 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com June 20, 2014

June 20, 2014

Author: echatellier Date: 2014-06-20 11:44:35 +0200 (Fri, 20 Jun 2014) New Revision: 241 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/241 Log: Fix filters accordion Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-20 09:38:28 UTC (rev 240) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-20 09:44:35 UTC (rev 241) @@ -767,48 +767,51 @@ <div id="tabs-filters" class="tab-pane" ng-controller="ConfigurationFilterController"> <input type="hidden" name="mailFiltersJson" value="{{mailFilters}}" /> - <div class="panel panel-default"> - <div class="panel-heading" ng-repeat-start="mailFolder in mailFolders"> - <h4 class="panel-title"> - <a data-toggle="collapse" data-parent="#accordion" href="#mailFilerAccordion{{$index}}"> - Filtre du dossier {{mailFolder.name}} - </a> - </h4> - </div> - <div id="mailFilerAccordion{{$index}}" class="panel-collapse collapse" ng-repeat-end> - <div class="panel-body"> - <table class="table table-hover table-bordered"> - <thead> - <tr> - <th>Filtre</th> - <th>Dossier</th> - <th/> - </tr> - </thead> - <tbody ui-sortable="sortableOptions" ng-model="rootFolderMailFilters[mailFolder.topiaId]"> - <tr ng-repeat="mailFilter in rootFolderMailFilters[mailFolder.topiaId]"> - <td>{{mailFilter.expression}}</td> - <td>{{mailFilter.mailFolder.$fullPath}}</td> - <td><a class="btn btn-danger btn-xs" ng-click="removeFilter(mailFolder, mailFilter)"> - <span class="glyphicon glyphicon-remove"></span> - </a></td> - </tr> - </tbody> - </table> - - <div role="form"> - <div class="form-group"> - <label for="filterField">Filtre</label> - <input type="text" class="form-control" id="folderField" ng-model="newFilter.expression"> + <div class="panel-group" id="accordionFilters"> + + <div class="panel panel-default" ng-repeat="mailFolder in mailFolders"> + <div class="panel-heading"> + <h4 class="panel-title"> + <a data-toggle="collapse" data-parent="#accordionFilters" href="#mailFilerAccordion{{$index}}"> + Filtre du dossier {{mailFolder.name}} + </a> + </h4> + </div> + <div id="mailFilerAccordion{{$index}}" class="panel-collapse collapse"> + <div class="panel-body"> + <table class="table table-hover table-bordered"> + <thead> + <tr> + <th>Filtre</th> + <th>Dossier</th> + <th/> + </tr> + </thead> + <tbody ui-sortable="sortableOptions" ng-model="rootFolderMailFilters[mailFolder.topiaId]"> + <tr ng-repeat="mailFilter in rootFolderMailFilters[mailFolder.topiaId]"> + <td>{{mailFilter.expression}}</td> + <td>{{mailFilter.mailFolder.$fullPath}}</td> + <td><a class="btn btn-danger btn-xs" ng-click="removeFilter(mailFolder, mailFilter)"> + <span class="glyphicon glyphicon-remove"></span> + </a></td> + </tr> + </tbody> + </table> + + <div role="form"> + <div class="form-group"> + <label for="filterField">Filtre</label> + <input type="text" class="form-control" id="folderField" ng-model="newFilter.expression"> + </div> + <div class="form-group"> + <label for="folderField">Dossier</label> + <select class="form-control" ng-model="newFilter.mailFolder" ng-options="mailFolder.$fullPath for mailFolder in flatMailFolders[mailFolder.topiaId]"></select> + </div> </div> - <div class="form-group"> - <label for="folderField">Dossier</label> - <select class="form-control" ng-model="newFilter.mailFolder" ng-options="mailFolder.$fullPath for mailFolder in flatMailFolders[mailFolder.topiaId]"></select> - </div> + <button type="button" class="btn btn-success" ng-disabled="!newFilter.expression || !newFilter.mailFolder" ng-click="addNewFilter(mailFolder)"> + <i class="glyphicon glyphicon-plus"></i> Ajouter + </button> </div> - <button type="button" class="btn btn-success" ng-disabled="!newFilter.expression || !newFilter.mailFolder" ng-click="addNewFilter(mailFolder)"> - <i class="glyphicon glyphicon-plus"></i> Ajouter - </button> </div> </div> </div>

1 0

r240 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin
by echatellier＠users.forge.codelutin.com June 20, 2014

June 20, 2014

Author: echatellier Date: 2014-06-20 11:38:28 +0200 (Fri, 20 Jun 2014) New Revision: 240 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/240 Log: Refactoring de la sauvegarde de la conf pour avoir un seul et unique commit. Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-20 09:16:31 UTC (rev 239) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-20 09:38:28 UTC (rev 240) @@ -46,10 +46,16 @@ import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.ConfigurationImpl; import com.franciaflex.faxtomail.persistence.entities.ConfigurationTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.DemandType; +import com.franciaflex.faxtomail.persistence.entities.DemandTypeImpl; +import com.franciaflex.faxtomail.persistence.entities.DemandTypeTopiaDao; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailAccountImpl; import com.franciaflex.faxtomail.persistence.entities.EmailAccountTopiaDao; import com.franciaflex.faxtomail.persistence.entities.EmailProtocol; +import com.franciaflex.faxtomail.persistence.entities.EtatAttente; +import com.franciaflex.faxtomail.persistence.entities.EtatAttenteImpl; +import com.franciaflex.faxtomail.persistence.entities.EtatAttenteTopiaDao; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupTopiaDao; @@ -59,6 +65,8 @@ import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.MailFolderImpl; +import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.base.Function; import com.google.common.collect.Lists; @@ -87,37 +95,192 @@ } /** + * Get all mail filter ordered by position. + * + * @return all mail filter + */ + public List<MailFilter> getMailFilters() { + MailFilterTopiaDao mailFilterDao = getPersistenceContext().getMailFilterDao(); + List<MailFilter> result = mailFilterDao.forAll().setOrderByArguments(MailFilter.PROPERTY_POSITION + " asc").findAll(); + return result; + } + + /** * Save configuration. * * @param config configuration to save */ - public void saveConfiguration(Configuration config) { + protected void saveConfiguration(Configuration config) { ConfigurationTopiaDao dao = getPersistenceContext().getConfigurationDao(); if (config.isPersisted()) { config = dao.update(config); } else { config = dao.create(config); } + } + + /** + * Sauve l'ensemble de la configuration. + * + * @param configuration configuration + * @param demandTypes types de demande + * @param etatAttentes etat d'attentes + * @param mailFolders mail folder + * @param mailFilters mail filters + * @param emailAccounts mail accounts + */ + public void save(Configuration configuration, List<DemandType> demandTypes, List<EtatAttente> etatAttentes, List<MailFolder> mailFolders, + List<MailFilter> mailFilters, List<EmailAccount> emailAccounts) { + + saveConfiguration(configuration); + saveDemandTypes(demandTypes); + saveMailFolders(mailFolders); // save before etat d'attente to remove reference + saveEtatAttente(etatAttentes); + saveMailFilters(mailFilters); + saveEmailAccounts(emailAccounts); + + // unique commit pour toute la conf getPersistenceContext().commit(); } + protected void saveDemandTypes(List<DemandType> demandTypes) { + Binder<DemandType, DemandType> binderDemandType = BinderFactory.newBinder(DemandType.class); + DemandTypeTopiaDao demandTypeDAO = getPersistenceContext().getDemandTypeDao(); + + List<DemandType> allDemandType = demandTypeDAO.findAll(); + Map<String, DemandType> allDemandTypeIndex = new HashMap<>(Maps.uniqueIndex(allDemandType, TopiaEntities.getTopiaIdFunction())); + for (DemandType demandType : demandTypes) { + // get current etat attente + DemandType currentDemandType; + if (StringUtils.isBlank(demandType.getTopiaId()) || demandType.getTopiaId().startsWith("new_")) { + currentDemandType = new DemandTypeImpl(); + } else { + currentDemandType = allDemandTypeIndex.remove(demandType.getTopiaId()); + } + + // copy + binderDemandType.copyExcluding(demandType, currentDemandType, + EtatAttente.PROPERTY_TOPIA_ID, + EtatAttente.PROPERTY_TOPIA_CREATE_DATE, + EtatAttente.PROPERTY_TOPIA_VERSION); + + // persist + if (currentDemandType.isPersisted()) { + demandTypeDAO.update(currentDemandType); + } else { + demandTypeDAO.create(currentDemandType); + } + } + } + + protected void saveEtatAttente(Collection<EtatAttente> etatAttentes) { + + Binder<EtatAttente, EtatAttente> binderEtatAttente = BinderFactory.newBinder(EtatAttente.class); + EtatAttenteTopiaDao etatAttenteDAO = getPersistenceContext().getEtatAttenteDao(); + + List<EtatAttente> allEtatAttente = etatAttenteDAO.findAll(); + Map<String, EtatAttente> allEtatAttenteIndex = new HashMap<>(Maps.uniqueIndex(allEtatAttente, TopiaEntities.getTopiaIdFunction())); + for (EtatAttente etatAttente : etatAttentes) { + // get current etat attente + EtatAttente currentEtatAttente; + if (StringUtils.isBlank(etatAttente.getTopiaId()) || etatAttente.getTopiaId().startsWith("new_")) { + currentEtatAttente = new EtatAttenteImpl(); + } else { + currentEtatAttente = allEtatAttenteIndex.remove(etatAttente.getTopiaId()); + } + + // copy + binderEtatAttente.copyExcluding(etatAttente, currentEtatAttente, + EtatAttente.PROPERTY_TOPIA_ID, + EtatAttente.PROPERTY_TOPIA_CREATE_DATE, + EtatAttente.PROPERTY_TOPIA_VERSION); + + // persist + if (currentEtatAttente.isPersisted()) { + etatAttenteDAO.update(currentEtatAttente); + } else { + etatAttenteDAO.create(currentEtatAttente); + } + } + + // delete remaining + etatAttenteDAO.deleteAll(allEtatAttenteIndex.values()); + } + /** - * Get all mail filter ordered by position. + * Save mail folder without commit. * - * @return all mail filter + * @param newMailFolders mail folders */ - public List<MailFilter> getMailFilters() { - MailFilterTopiaDao mailFilterDao = getPersistenceContext().getMailFilterDao(); - List<MailFilter> result = mailFilterDao.forAll().setOrderByArguments(MailFilter.PROPERTY_POSITION + " asc").findAll(); + protected void saveMailFolders(Collection<MailFolder> newMailFolders) { + // get current folders + MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); + List<MailFolder> mailFolders = dao.findAll(); + Map<String, MailFolder> mailFolderMap = new HashMap<>(Maps.uniqueIndex(mailFolders, TopiaEntities.getTopiaIdFunction())); + + // recursive update + saveMailFolders(dao, mailFolderMap, null, newMailFolders); + + // if map is not empty after recursive iteration, remaining folder must be deleted + dao.deleteAll(mailFolderMap.values()); + } + + /** + * Save mail folder without commit. + * + * @param dao + * @param mailFolderMap + * @param parent + * @param mailFolders + * @return + */ + protected Collection<MailFolder> saveMailFolders(MailFolderTopiaDao dao, Map<String, MailFolder> mailFolderMap, + MailFolder parent, Collection<MailFolder> mailFolders) { + + Collection<MailFolder> result = Lists.newArrayList(); + if (mailFolders == null) { + return result; + } + + Binder<MailFolder, MailFolder> binderMailFolder = BinderFactory.newBinder(MailFolder.class); + for (MailFolder mailFolder : mailFolders) { + + MailFolder currentMailFolder; + if (StringUtils.isBlank(mailFolder.getTopiaId()) || mailFolder.getTopiaId().startsWith("new_")) { + currentMailFolder = new MailFolderImpl(); + } else { + currentMailFolder = mailFolderMap.remove(mailFolder.getTopiaId()); + } + + binderMailFolder.copyExcluding(mailFolder, currentMailFolder, + MailFolder.PROPERTY_TOPIA_ID, + MailFolder.PROPERTY_TOPIA_CREATE_DATE, + MailFolder.PROPERTY_TOPIA_VERSION, + MailFolder.PROPERTY_CHILDREN, + MailFolder.PROPERTY_PARENT); + + currentMailFolder.setParent(parent); + + if (!currentMailFolder.isPersisted()) { + currentMailFolder = dao.create(currentMailFolder); + } + + Collection<MailFolder> children = saveMailFolders(dao, mailFolderMap, currentMailFolder, mailFolder.getChildren()); + currentMailFolder.setChildren(children); + dao.update(currentMailFolder); + + result.add(currentMailFolder); + } + return result; } /** - * Save all mail filters. + * Save all mail filters without commit. * * @param mailFilters mail filters to save */ - public void saveMailFilters(List<MailFilter> mailFilters) { + protected void saveMailFilters(List<MailFilter> mailFilters) { MailFilterTopiaDao dao = getPersistenceContext().getMailFilterDao(); int position = 0; @@ -146,7 +309,6 @@ } dao.deleteAll(filterById.values()); - getPersistenceContext().commit(); } /** @@ -177,10 +339,11 @@ } /** + * Save email account without commit. * * @param newEmailAccounts new email account list to save */ - public void saveEmailAccounts(List<EmailAccount> newEmailAccounts) { + protected void saveEmailAccounts(List<EmailAccount> newEmailAccounts) { EmailAccountTopiaDao emailAccountTopiaDao = getPersistenceContext().getEmailAccountDao(); List<EmailAccount> emailAccounts = emailAccountTopiaDao.findAll(); Map<String, EmailAccount> emailAccountMap = new HashMap<>(Maps.uniqueIndex(emailAccounts, TopiaEntities.getTopiaIdFunction())); @@ -213,7 +376,6 @@ } emailAccountTopiaDao.deleteAll(emailAccountMap.values()); - getPersistenceContext().commit(); } public List<FaxToMailUser> getAllUsers() { Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-20 09:16:31 UTC (rev 239) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-20 09:38:28 UTC (rev 240) @@ -94,62 +94,6 @@ return new ArrayList<MailFolder>(dao.forTopiaIdIn(ids).findAll()); } - public void saveMailFolders(Collection<MailFolder> newMailFolders) { - // get current folders - MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); - List<MailFolder> mailFolders = dao.findAll(); - Map<String, MailFolder> mailFolderMap = new HashMap<>(Maps.uniqueIndex(mailFolders, TopiaEntities.getTopiaIdFunction())); - - // recursive update - saveMailFolders(dao, mailFolderMap, null, newMailFolders); - - // if map is not empty after recursive iteration, remaining folder must be deleted - dao.deleteAll(mailFolderMap.values()); - - getPersistenceContext().commit(); - } - - protected Collection<MailFolder> saveMailFolders(MailFolderTopiaDao dao, Map<String, MailFolder> mailFolderMap, - MailFolder parent, Collection<MailFolder> mailFolders) { - - Collection<MailFolder> result = Lists.newArrayList(); - if (mailFolders == null) { - return result; - } - - Binder<MailFolder, MailFolder> binderMailFolder = BinderFactory.newBinder(MailFolder.class); - for (MailFolder mailFolder : mailFolders) { - - MailFolder currentMailFolder; - if (StringUtils.isBlank(mailFolder.getTopiaId()) || mailFolder.getTopiaId().startsWith("new_")) { - currentMailFolder = new MailFolderImpl(); - } else { - currentMailFolder = mailFolderMap.remove(mailFolder.getTopiaId()); - } - - binderMailFolder.copyExcluding(mailFolder, currentMailFolder, - MailFolder.PROPERTY_TOPIA_ID, - MailFolder.PROPERTY_TOPIA_CREATE_DATE, - MailFolder.PROPERTY_TOPIA_VERSION, - MailFolder.PROPERTY_CHILDREN, - MailFolder.PROPERTY_PARENT); - - currentMailFolder.setParent(parent); - - if (!currentMailFolder.isPersisted()) { - currentMailFolder = dao.create(currentMailFolder); - } - - Collection<MailFolder> children = saveMailFolders(dao, mailFolderMap, currentMailFolder, mailFolder.getChildren()); - currentMailFolder.setChildren(children); - dao.update(currentMailFolder); - - result.add(currentMailFolder); - } - - return result; - } - public Collection<MailFolder> getFoldersWithEtatAttente(EtatAttente etatAttente) { Collection<MailFolder> result = new HashSet<>(); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-06-20 09:16:31 UTC (rev 239) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-06-20 09:38:28 UTC (rev 240) @@ -103,74 +103,6 @@ return result; } - public void saveEtatAttente(Collection<EtatAttente> etatAttentes) { - - Binder<EtatAttente, EtatAttente> binderEtatAttente = BinderFactory.newBinder(EtatAttente.class); - EtatAttenteTopiaDao etatAttenteDAO = getPersistenceContext().getEtatAttenteDao(); - - List<EtatAttente> allEtatAttente = getAllEtatAttente(); - Map<String, EtatAttente> allEtatAttenteIndex = new HashMap<>(Maps.uniqueIndex(allEtatAttente, TopiaEntities.getTopiaIdFunction())); - for (EtatAttente etatAttente : etatAttentes) { - // get current etat attente - EtatAttente currentEtatAttente; - if (StringUtils.isBlank(etatAttente.getTopiaId()) || etatAttente.getTopiaId().startsWith("new_")) { - currentEtatAttente = new EtatAttenteImpl(); - } else { - currentEtatAttente = allEtatAttenteIndex.remove(etatAttente.getTopiaId()); - } - - // copy - binderEtatAttente.copyExcluding(etatAttente, currentEtatAttente, - EtatAttente.PROPERTY_TOPIA_ID, - EtatAttente.PROPERTY_TOPIA_CREATE_DATE, - EtatAttente.PROPERTY_TOPIA_VERSION); - - // persist - if (currentEtatAttente.isPersisted()) { - etatAttenteDAO.update(currentEtatAttente); - } else { - etatAttenteDAO.create(currentEtatAttente); - } - } - - // delete remaining - etatAttenteDAO.deleteAll(allEtatAttenteIndex.values()); - - getPersistenceContext().commit(); - } - - public void saveDemandTypes(List<DemandType> demandTypes) { - Binder<DemandType, DemandType> binderDemandType = BinderFactory.newBinder(DemandType.class); - DemandTypeTopiaDao demandTypeDAO = getPersistenceContext().getDemandTypeDao(); - - List<DemandType> allDemandType = getAllDemandType(); - Map<String, DemandType> allDemandTypeIndex = new HashMap<>(Maps.uniqueIndex(allDemandType, TopiaEntities.getTopiaIdFunction())); - for (DemandType demandType : demandTypes) { - // get current etat attente - DemandType currentDemandType; - if (StringUtils.isBlank(demandType.getTopiaId()) || demandType.getTopiaId().startsWith("new_")) { - currentDemandType = new DemandTypeImpl(); - } else { - currentDemandType = allDemandTypeIndex.remove(demandType.getTopiaId()); - } - - // copy - binderDemandType.copyExcluding(demandType, currentDemandType, - EtatAttente.PROPERTY_TOPIA_ID, - EtatAttente.PROPERTY_TOPIA_CREATE_DATE, - EtatAttente.PROPERTY_TOPIA_VERSION); - - // persist - if (currentDemandType.isPersisted()) { - demandTypeDAO.update(currentDemandType); - } else { - demandTypeDAO.create(currentDemandType); - } - } - - getPersistenceContext().commit(); - } - public List<Client> getAllClients() { ClientTopiaDao dao = getPersistenceContext().getClientDao(); return new ArrayList<>(dao.findAll()); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-20 09:16:31 UTC (rev 239) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-20 09:38:28 UTC (rev 240) @@ -67,7 +67,6 @@ import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; -import org.nuiton.util.DesktopUtil; import org.nuiton.util.FileUtil; import com.franciaflex.faxtomail.persistence.entities.Attachment; Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-20 09:16:31 UTC (rev 239) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-20 09:38:28 UTC (rev 240) @@ -123,12 +123,7 @@ public String execute() throws Exception { String result = super.execute(); - configurationService.saveConfiguration(configuration); - referentielService.saveDemandTypes(demandTypes); - mailFolderService.saveMailFolders(mailFolders); // before etat attente - referentielService.saveEtatAttente(etatAttentes); - configurationService.saveMailFilters(mailFilters); - configurationService.saveEmailAccounts(emailAccounts); + configurationService.save(configuration, demandTypes, etatAttentes, mailFolders, mailFilters, emailAccounts); return result; }

1 0

r239 - in trunk/faxtomail-ui-web/src/main: java/com/franciaflex/faxtomail/web/action/admin webapp/WEB-INF/content/admin webapp/js
by echatellier＠users.forge.codelutin.com June 20, 2014

June 20, 2014

Author: echatellier Date: 2014-06-20 11:16:31 +0200 (Fri, 20 Jun 2014) New Revision: 239 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/239 Log: Correction d'un bug si les etats d'attente supprim?\195?\169s sont utilis?\195?\169s par la configuration des mailFolders Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-20 09:14:33 UTC (rev 238) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-20 09:16:31 UTC (rev 239) @@ -124,9 +124,9 @@ String result = super.execute(); configurationService.saveConfiguration(configuration); + referentielService.saveDemandTypes(demandTypes); + mailFolderService.saveMailFolders(mailFolders); // before etat attente referentielService.saveEtatAttente(etatAttentes); - referentielService.saveDemandTypes(demandTypes); - mailFolderService.saveMailFolders(mailFolders); configurationService.saveMailFilters(mailFilters); configurationService.saveEmailAccounts(emailAccounts); Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-20 09:14:33 UTC (rev 238) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-20 09:16:31 UTC (rev 239) @@ -155,7 +155,7 @@ ng-click="editEtatAttente(etatAttente)"> <td>{{etatAttente.label}} - <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="deleteEtatAttente($index)" + <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="deleteEtatAttente(etatAttente, $index)" ng-disabled="etatAttentesUsage[etatAttente.topiaId] > 0" tooltip="{{etatAttentesUsage[etatAttente.topiaId] > 0 && 'Cet état d\'attente est utilisé et ne peut pas être supprimé'|| 'Supprimer cet état d\'attente'}}"> <span class="glyphicon glyphicon-remove"></span></a> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 09:14:33 UTC (rev 238) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 09:16:31 UTC (rev 239) @@ -174,12 +174,31 @@ }; // suppression d'un etat d'attente non utilisé - $scope.deleteEtatAttente = function(index) { + $scope.deleteEtatAttente = function(etatAttente, index) { if ($window.confirm("Êtes-vous sûr de vouloir supprimer cet état d'attente ?")) { $scope.etatAttentes.splice(index, 1); } + + // suppression de cet etat d'attente dans les mail folder (sinon, ca fait + // un resauvegarde d'un etat d'attente supprimé et donc un bug) + removeEtatAttenteFromMailFolder(etatAttente, $scope.mailFolders); }; + // suppression de cet etat d'attente dans les mail folder (sinon, ca fait + // un resauvegarde d'un etat d'attente supprimé et donc un bug) + var removeEtatAttenteFromMailFolder = function(etatAttente, mailFolders) { + if (mailFolders) { + angular.forEach(mailFolders, function(mailFolder) { + var index = mailFolder.etatAttentes.indexOfByTopiaId(etatAttente); + if (index != -1) { + console.log("Remove etat from " + mailFolder.name); + mailFolder.etatAttentes.splice(index, 1); + } + removeEtatAttenteFromMailFolder(etatAttente, mailFolder.children); + }); + } + }; + // selection/deselection d'une action $scope.changeEtatAttenteValidAction = function(action) { var index = $scope.selectedEtatAttente.validFormDisabledActions.indexOf(action);

1 0

r238 - trunk/faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com June 20, 2014

June 20, 2014

Author: echatellier Date: 2014-06-20 11:14:33 +0200 (Fri, 20 Jun 2014) New Revision: 238 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/238 Log: Remove tests Modified: trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js Modified: trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-06-20 07:58:45 UTC (rev 237) +++ trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-06-20 09:14:33 UTC (rev 238) @@ -37,10 +37,6 @@ return _p8() + _p8(true) + _p8(true) + _p8(); } -console.log("abc" === "abc");// true -console.log("abc" === new String("abc")); // false -console.log(new String("abc") === new String("abc")); // false - /** * Même fonction que indexOf mais qui compare par topiaId au lieu des références. */

1 0

r237 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier＠users.forge.codelutin.com June 20, 2014

June 20, 2014

Author: echatellier Date: 2014-06-20 09:58:45 +0200 (Fri, 20 Jun 2014) New Revision: 237 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/237 Log: Gestion du cas o?\195?\185 le pdf convertit est vide Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-19 16:09:40 UTC (rev 236) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-20 07:58:45 UTC (rev 237) @@ -64,6 +64,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.StringUtil; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -468,10 +469,17 @@ // read output to save into attachment byte[] outContent = FileUtils.readFileToByteArray(outfile); - AttachmentFile editedFile = new AttachmentFileImpl(); - editedFile.setContent(outContent); - editedFile.setFilename(basename + "-converted.pdf"); - attachment.setEditedFile(editedFile); + + // on va dire que normalement un pdf ca fait plus de 1 octet + if (outContent.length >= 1) { + AttachmentFile editedFile = new AttachmentFileImpl(); + editedFile.setContent(outContent); + editedFile.setFilename(basename + "-converted.pdf"); + attachment.setEditedFile(editedFile); + } else if (log.isWarnEnabled()) { + log.warn("Can't convert extension to pdf (content is empty)"); + } + } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Cannot run convert command", e);

1 0

r236 - in trunk: faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com June 19, 2014

June 19, 2014

Author: echatellier Date: 2014-06-19 18:09:40 +0200 (Thu, 19 Jun 2014) New Revision: 236 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/236 Log: Conversion des pi?\195?\168ces jointes en PDF ?\195?\160 la r?\195?\169ception Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-19 15:08:04 UTC (rev 235) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-19 16:09:40 UTC (rev 236) @@ -67,6 +67,7 @@ import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; +import org.nuiton.util.DesktopUtil; import org.nuiton.util.FileUtil; import com.franciaflex.faxtomail.persistence.entities.Attachment; Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-19 15:08:04 UTC (rev 235) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-19 16:09:40 UTC (rev 236) @@ -26,6 +26,8 @@ import static org.nuiton.i18n.I18n.t; +import java.io.File; +import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.text.DateFormat; @@ -53,27 +55,33 @@ import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeUtility; -import com.franciaflex.faxtomail.persistence.entities.Client; -import com.franciaflex.faxtomail.services.service.ClientService; - +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.Charsets; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; +import org.nuiton.util.StringUtil; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.persistence.entities.AttachmentFileImpl; import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; +import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailImpl; +import com.franciaflex.faxtomail.persistence.entities.ExtensionCommand; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.services.service.ClientService; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.MailFolderService; @@ -88,6 +96,7 @@ protected FaxToMailServiceContext serviceContext; + protected ConfigurationService configurationService; @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { serviceContext = getServiceContext(jobExecutionContext); @@ -96,7 +105,7 @@ log.debug("Running MailFilterJob at " + serviceContext.getNow()); } - ConfigurationService configurationService = serviceContext.newService(ConfigurationService.class); + configurationService = serviceContext.newService(ConfigurationService.class); Collection<EmailAccount> emailAccounts = configurationService.getEmailAccounts(); for (EmailAccount account : emailAccounts) { @@ -373,6 +382,7 @@ DataHandler dh = bp.getDataHandler(); + // create new attachment Attachment attachment = new AttachmentImpl(); attachment.setAddedByUser(false); AttachmentFile attachmentFile = emailService.getAttachmentFileFromStream(dh.getInputStream()); @@ -380,7 +390,10 @@ attachment.setOriginalFile(attachmentFile); attachment.setContentId(contentID); - //email.addAttachment(attachment); + // convert attachment if defined by admin + convertIfNecessary(attachment); + + // save attachment attachments.add(attachment); } } @@ -392,4 +405,83 @@ Charset charset = Charsets.toCharset(charsetName); return charset; } + + /** + * Retourne un input stream sur une piece jointe convertie ou pas. + * + * @param attachment to convert + * @return attachment + * @throws IOException + */ + protected Attachment convertIfNecessary(Attachment attachment) throws IOException { + + // get file extension + String filename = attachment.getOriginalFileName(); + String extension = FilenameUtils.getExtension(filename); + + Collection<ExtensionCommand> commands = CollectionUtils.emptyIfNull(configurationService.getConfiguration().getExtensionCommands()); + for (ExtensionCommand command : commands) { + if (extension.equalsIgnoreCase(command.getExtension())) { + attachment = convertToPdf(attachment, command); + break; + } + } + return attachment; + } + + /** + * Convert attachment to pdf. + * + * @param attachment attchment to convert + * @param extensionCommand command + * @return + * @throws IOException + */ + protected Attachment convertToPdf(Attachment attachment, ExtensionCommand extensionCommand) throws IOException { + + // get file extension + String filename = attachment.getOriginalFileName(); + String basename = FilenameUtils.getBaseName(filename); + String extension = FilenameUtils.getExtension(filename); + + // copy file to temp file + File file = File.createTempFile("faxtomail-" + basename, "." + extension); + file.deleteOnExit(); + File outfile = File.createTempFile("faxtomail-" + basename, ".pdf"); + outfile.deleteOnExit(); + FileUtils.writeByteArrayToFile(file, attachment.getOriginalFile().getContent()); + + // get process command + String command = extensionCommand.getConvertToPdfCommand(); + command = StringUtils.replaceOnce(command, "%f", "\"" + file.getAbsolutePath() + "\""); + command = StringUtils.replaceOnce(command, "%o", "\"" + outfile.getAbsolutePath() + "\""); + + String[] args = StringUtil.split(command, " "); + List<String> comArgs = Arrays.asList(args); + ProcessBuilder pb = new ProcessBuilder(comArgs); + // run process + if (log.isDebugEnabled()) { + log.debug("Convert attachment with command : " + comArgs); + } + try { + pb.start(); + + // read output to save into attachment + byte[] outContent = FileUtils.readFileToByteArray(outfile); + AttachmentFile editedFile = new AttachmentFileImpl(); + editedFile.setContent(outContent); + editedFile.setFilename(basename + "-converted.pdf"); + attachment.setEditedFile(editedFile); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Cannot run convert command", e); + } + } + + // cleanup + //file.delete(); + //outfile.delete(); + + return attachment; + } } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-19 15:08:04 UTC (rev 235) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-19 16:09:40 UTC (rev 236) @@ -119,6 +119,7 @@ <div class="form-group"> <label for="convertToToPdfField">Conversion en pdf :</label> <input id="convertToToPdfField" type="text" class="form-control" ng-model="extensionCommand.convertToPdfCommand" placeholder="" /> + <p class="help-block">Utilisez <code>%f</code> et <code>%o</code> pour representer respectivement le fichier en entrée et en sortie de la commande</p> </div> <div class="form-group"> <label for="openAttachmentCommandField">Ouverture :</label>

1 0

r235 - trunk
by echatellier＠users.forge.codelutin.com June 19, 2014

June 19, 2014

Author: echatellier Date: 2014-06-19 17:08:04 +0200 (Thu, 19 Jun 2014) New Revision: 235 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/235 Log: ddu Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-19 15:01:03 UTC (rev 234) +++ trunk/pom.xml 2014-06-19 15:08:04 UTC (rev 235) @@ -105,7 +105,7 @@ <nuitonWebVersion>1.16</nuitonWebVersion> <eugeneVersion>2.10</eugeneVersion> - <topiaVersion>3.0-beta-5</topiaVersion> + <topiaVersion>3.0-beta-6</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> <h2Version>1.3.176</h2Version> @@ -525,7 +525,7 @@ <dependency> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-core</artifactId> - <version>1.7.5</version> + <version>1.7.6</version> <scope>runtime</scope> </dependency>

1 0

r234 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content faxtomail-ui-swing/src/
by echatellier＠users.forge.codelutin.com June 19, 2014

June 19, 2014

Author: echatellier Date: 2014-06-19 17:01:03 +0200 (Thu, 19 Jun 2014) New Revision: 234 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/234 Log: Fix imports Removed: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailEntityNotFoundException.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailIllegalAccessException.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailNoIdException.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailStrutsObjectFactory.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GroupAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/config/FaxToMailConfigUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeRowModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupButton.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUI.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/faxtomail-ui-web/src/main/resources/struts.xml Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,7 +24,6 @@ * #L% */ -import org.jdesktop.beans.AbstractSerializableBean; import org.nuiton.jaxx.application.type.ApplicationProgressionModel; import org.nuiton.updater.DownloadMonitor; Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,7 +24,6 @@ * #L% */ -import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileOutputStream; Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java 2014-06-19 15:01:03 UTC (rev 234) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.persistence.entities; +/* + * #%L + * FaxToMail :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * @author Kevin Morin (Code Lutin) * @since x.x Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-06-19 15:01:03 UTC (rev 234) @@ -41,11 +41,8 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n.t; - /** * @author Kevin Morin (Code Lutin) * @since x.x Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-19 15:01:03 UTC (rev 234) @@ -35,7 +35,6 @@ import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.Store; -import javax.mail.URLName; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-06-19 15:01:03 UTC (rev 234) @@ -49,7 +49,6 @@ import com.franciaflex.faxtomail.persistence.entities.DemandTypeTopiaDao; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailAccountTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.EmailTopiaDao; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.EtatAttenteImpl; import com.franciaflex.faxtomail.persistence.entities.EtatAttenteTopiaDao; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-06-19 15:01:03 UTC (rev 234) @@ -50,7 +50,6 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractBean; import org.jdesktop.swingx.JXLoginPane; -import org.jdesktop.swingx.JXLoginPane.JXLoginDialog; import org.jdesktop.swingx.JXLoginPane.Status; import org.jdesktop.swingx.auth.LoginService; import org.nuiton.i18n.I18n; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -27,7 +27,6 @@ import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; import javax.swing.*; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -28,7 +28,6 @@ import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.RangeRow; -import com.franciaflex.faxtomail.persistence.entities.RangeRowImpl; import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUI; import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUIModel; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -1,7 +1,30 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.ui.swing.content.MainUI; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIHandler; @@ -11,9 +34,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.awt.*; -import java.io.IOException; - import static org.nuiton.i18n.I18n.t; /** Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -37,7 +37,6 @@ import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI; @@ -48,10 +47,8 @@ import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUI; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUIHandler; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUIModel; -import com.franciaflex.faxtomail.ui.swing.util.JImagePanel; import com.itextpdf.text.BaseColor; import com.itextpdf.text.Document; -import com.itextpdf.text.Image; import com.itextpdf.text.Phrase; import com.itextpdf.text.pdf.BaseFont; import com.itextpdf.text.pdf.ColumnText; @@ -64,15 +61,8 @@ import com.itextpdf.text.pdf.PdfReader; import com.itextpdf.text.pdf.PdfStamper; import com.itextpdf.text.pdf.PdfWriter; -import com.sun.media.jai.codec.ByteArraySeekableStream; -import com.sun.media.jai.codec.ImageCodec; -import com.sun.media.jai.codec.ImageDecoder; -import com.sun.media.jai.codec.SeekableStream; -import com.sun.pdfview.PDFFile; -import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.w3c.dom.css.Rect; import static org.nuiton.i18n.I18n.t; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GroupAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GroupAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GroupAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,21 +24,17 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.services.service.EmailService; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUI; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUIHandler; -import com.franciaflex.faxtomail.ui.swing.content.search.SearchUI; import com.franciaflex.faxtomail.ui.swing.content.search.SearchUIModel; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; import org.jdesktop.swingx.JXTable; import javax.swing.*; -import java.util.Date; import static org.nuiton.i18n.I18n.t; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -32,9 +32,6 @@ import javax.swing.*; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - import static org.nuiton.i18n.I18n.t; /** Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -22,14 +22,11 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.ui.swing.FaxToMailScreen; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.RunFaxToMail; import com.franciaflex.faxtomail.ui.swing.content.config.FaxToMailConfigUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; import com.franciaflex.faxtomail.ui.swing.content.search.SearchUI; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; @@ -40,8 +37,6 @@ import jaxx.runtime.JAXXBinding; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXWidgetUtil; -import jaxx.runtime.swing.TabInfo; -import jaxx.runtime.swing.TabInfoPropertyChangeListener; import jaxx.runtime.swing.session.SwingSession; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -28,10 +28,7 @@ import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; import com.franciaflex.faxtomail.ui.swing.actions.EditAttachmentAction; import com.franciaflex.faxtomail.ui.swing.actions.OpenAttachmentAction; -import com.franciaflex.faxtomail.ui.swing.content.MainUI; -import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUI; import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupHandler; -import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -43,18 +40,13 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.HighlighterFactory; -import org.nuiton.util.DesktopUtil; import org.nuiton.util.FileUtil; import java.awt.Component; -import java.awt.Cursor; -import java.awt.Desktop; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; -import java.io.IOException; import java.io.InputStream; import java.util.List; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -29,7 +29,6 @@ import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; -import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.List; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/config/FaxToMailConfigUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/config/FaxToMailConfigUIHandler.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/config/FaxToMailConfigUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -25,7 +25,6 @@ import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.actions.ReloadFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; -import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -26,7 +26,6 @@ import org.jdesktop.beans.AbstractSerializableBean; import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -23,8 +23,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFileImpl; import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,14 +24,11 @@ * #L% */ -import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.Configuration; -import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.MailAction; import com.franciaflex.faxtomail.ui.swing.actions.ArchiveAction; -import com.franciaflex.faxtomail.ui.swing.actions.GoToPreviousScreenAction; import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenDialogAction; import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeAndExitAction; import com.franciaflex.faxtomail.ui.swing.content.print.AttachmentToPrintChooserUI; @@ -51,14 +48,11 @@ import org.nuiton.jaxx.application.swing.tab.TabContainerHandler; import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.nuiton.jaxx.application.swing.tab.TabHandler; -import org.nuiton.util.beans.BeanMonitor; import javax.swing.*; import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.Objects; -import java.util.Set; import static org.nuiton.i18n.I18n.t; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -29,10 +29,7 @@ import org.jdesktop.beans.AbstractBean; import java.util.ArrayList; -import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; -import java.util.Set; /** * @author Kevin Morin (Code Lutin) Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -25,7 +25,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.Range; -import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import jaxx.runtime.validator.swing.SwingValidator; import org.jdesktop.swingx.JXTable; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -25,8 +25,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.persistence.entities.RangeRow; -import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; import org.jdesktop.beans.AbstractSerializableBean; import java.util.ArrayList; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeRowModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeRowModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeRowModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,9 +24,6 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.EmailImpl; -import com.franciaflex.faxtomail.persistence.entities.History; import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.RangeRowImpl; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -25,15 +25,9 @@ */ import com.franciaflex.faxtomail.persistence.entities.RangeRow; -import com.franciaflex.faxtomail.persistence.entities.RangeRowImpl; -import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; - -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - import static org.nuiton.i18n.I18n.n; /** Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -26,10 +26,7 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.ui.swing.FaxToMailScreen; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.actions.ShowDemandeAction; -import com.franciaflex.faxtomail.ui.swing.content.MainUI; import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,19 +24,16 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.Reply; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupUI; import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupButton; import org.apache.commons.collections4.CollectionUtils; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Collection; -import java.util.List; import static org.nuiton.i18n.I18n.t; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,11 +24,7 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.HistoryType; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIModel; -import com.franciaflex.faxtomail.ui.swing.content.attachment.ButtonAttachment; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; @@ -43,7 +39,6 @@ import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; import java.awt.*; -import java.util.Date; import java.util.EventObject; /** Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,7 +24,6 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.Reply; import jaxx.runtime.SwingUtil; import org.apache.commons.collections.CollectionUtils; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -27,8 +27,6 @@ import java.util.ArrayList; import java.util.List; -import javax.swing.JPanel; - import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -36,7 +34,6 @@ import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; -import com.franciaflex.faxtomail.ui.swing.util.JImagePanel; /** * @author Kevin Morin (Code Lutin) Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -35,12 +35,8 @@ import org.apache.commons.logging.LogFactory; import javax.swing.*; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import java.util.ArrayList; -import java.util.List; import static org.nuiton.i18n.I18n.t; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -30,11 +30,8 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractBean; -import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; -import java.util.List; -import java.util.Set; /** * @author Kevin Morin (Code Lutin) Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -33,8 +33,6 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; import com.franciaflex.faxtomail.ui.swing.util.Cancelable; -import com.google.common.base.Function; -import com.google.common.collect.Collections2; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -56,7 +54,6 @@ import java.beans.PropertyChangeListener; import java.util.Arrays; import java.util.Calendar; -import java.util.Collection; import java.util.Date; import java.util.List; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -23,7 +23,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.DemandStatus; -import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailFilter; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.services.service.ReferentielService; @@ -33,8 +32,6 @@ import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; import com.franciaflex.faxtomail.ui.swing.util.CloseableUI; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; -import com.google.common.base.Function; -import com.google.common.collect.Collections2; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,7 +43,6 @@ import java.beans.PropertyChangeListener; import java.util.Arrays; import java.util.Calendar; -import java.util.Collection; import java.util.Date; import java.util.List; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -42,7 +42,6 @@ import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; import org.nuiton.jaxx.application.swing.ApplicationUI; import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; -import org.nuiton.jaxx.application.swing.util.*; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import javax.swing.*; @@ -50,13 +49,10 @@ import javax.swing.event.TableModelListener; import javax.swing.text.JTextComponent; import java.awt.*; -import java.awt.List; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.KeyEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Serializable; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupButton.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupButton.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupButton.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,25 +24,17 @@ * #L% */ -import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import jaxx.runtime.SwingUtil; -import org.jdesktop.beans.AbstractSerializableBean; import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.*; -import java.awt.List; import java.awt.event.HierarchyBoundsAdapter; import java.awt.event.HierarchyEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.util.*; -import static org.nuiton.i18n.I18n.t; - /** * @author Kevin Morin (Code Lutin) * @since x.x Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -23,7 +23,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.EmailImpl; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import org.apache.commons.logging.Log; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUI.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUI.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUI.java 2014-06-19 15:01:03 UTC (rev 234) @@ -22,12 +22,8 @@ * #L% */ -import jaxx.runtime.JAXXObject; import org.nuiton.jaxx.application.swing.ApplicationUI; -import javax.swing.UIManager; -import java.awt.Font; - /** * Contract to place on each generated jaxx ui. * Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java 2014-06-19 15:01:03 UTC (rev 234) @@ -23,7 +23,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import org.apache.commons.logging.LogFactory; import javax.swing.tree.DefaultMutableTreeNode; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,27 +24,17 @@ * #L% */ -import com.sun.media.jai.codec.ByteArraySeekableStream; -import com.sun.media.jai.codec.ImageCodec; -import com.sun.media.jai.codec.ImageDecoder; -import com.sun.media.jai.codec.SeekableStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.imageio.ImageIO; -import javax.media.jai.PlanarImage; import javax.swing.*; -import javax.swing.border.BevelBorder; import java.awt.*; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.image.BufferedImage; -import java.awt.image.RenderedImage; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; /** * @author Kevin Morin (Code Lutin) Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java 2014-06-19 15:01:03 UTC (rev 234) @@ -38,8 +38,6 @@ import java.io.File; -import javassist.expr.NewArray; - public class FaxToMailApplicationContext { private static Log log = LogFactory.getLog(FaxToMailApplicationContext.class); Deleted: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailEntityNotFoundException.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailEntityNotFoundException.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailEntityNotFoundException.java 2014-06-19 15:01:03 UTC (rev 234) @@ -1,33 +0,0 @@ -package com.franciaflex.faxtomail.web; - -/* - * #%L - * FaxToMail :: Web - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2014 Franciaflex, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -/** - * @author kmorin <kmorin(a)codelutin.com> - * @since 0.5 - */ -public class FaxToMailEntityNotFoundException extends RuntimeException { - -} Deleted: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailIllegalAccessException.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailIllegalAccessException.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailIllegalAccessException.java 2014-06-19 15:01:03 UTC (rev 234) @@ -1,32 +0,0 @@ -package com.franciaflex.faxtomail.web; - -/* - * #%L - * FaxToMail :: Web - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2014 Franciaflex, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -/** - * @author kmorin <morin(a)codelutin.com> - */ -public class FaxToMailIllegalAccessException extends RuntimeException { - -} Deleted: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailNoIdException.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailNoIdException.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailNoIdException.java 2014-06-19 15:01:03 UTC (rev 234) @@ -1,33 +0,0 @@ -package com.franciaflex.faxtomail.web; - -/* - * #%L - * FaxToMail :: Web - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2014 Franciaflex, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -/** - * @author kmorin <kmorin(a)codelutin.com> - * @since 0.1 - */ -public class FaxToMailNoIdException extends RuntimeException { - -} Deleted: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailStrutsObjectFactory.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailStrutsObjectFactory.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailStrutsObjectFactory.java 2014-06-19 15:01:03 UTC (rev 234) @@ -1,62 +0,0 @@ -package com.franciaflex.faxtomail.web; - -/* - * #%L - * FaxToMail :: Web - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2014 Franciaflex, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.impl.StrutsObjectFactory; - -public class FaxToMailStrutsObjectFactory extends StrutsObjectFactory { - - private static final Log log = LogFactory.getLog(FaxToMailStrutsObjectFactory.class); - -// @Override -// public Object buildBean(Class clazz, Map<String, Object> extraContext) throws Exception { -// -// Object instance; -// -// if (TopiaEntity.class.isAssignableFrom(clazz)) { -// -// if (log.isTraceEnabled()) { -// log.trace(" new instance of " + clazz.getCanonicalName()); -// } - -// ExtranetEncAhiEntityEnum extranetEncAhiEntityEnum = -// ExtranetEncAhiEntityEnum.valueOf(clazz); - -// Class<? extends TopiaEntity> implementation = extranetEncAhiEntityEnum.getImplementation(); - -// instance = implementation.newInstance(); - -// } else { -// -// instance = clazz.newInstance(); -// -// } -// -// return instance; -// } - -} Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -29,9 +29,6 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.services.service.LdapService; -import com.franciaflex.faxtomail.services.service.ldap.AuthenticationException; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; public class LogoutAction extends FaxToMailActionSupport { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,13 +24,8 @@ * #L% */ -import java.lang.reflect.Type; -import java.util.Collection; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.convention.annotation.Action; @@ -39,13 +34,8 @@ import org.apache.struts2.convention.annotation.Result; import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; -import com.franciaflex.faxtomail.services.service.MailFolderService; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; -import com.google.gson.reflect.TypeToken; import com.opensymphony.xwork2.Preparable; @InterceptorRefs({ Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -44,7 +44,6 @@ import com.franciaflex.faxtomail.services.service.MailFolderService; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; import com.google.gson.reflect.TypeToken; -import com.opensymphony.xwork2.Preparable; @InterceptorRefs({ @InterceptorRef("faxToMailInterceptor"), Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-19 15:01:03 UTC (rev 234) @@ -26,8 +26,6 @@ import static org.nuiton.i18n.I18n.t; -import java.io.File; -import java.io.FileOutputStream; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.text.DateFormat; @@ -59,7 +57,6 @@ import com.franciaflex.faxtomail.services.service.ClientService; import org.apache.commons.io.Charsets; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/faxtomail-ui-web/src/main/resources/struts.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/struts.xml 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/resources/struts.xml 2014-06-19 15:01:03 UTC (rev 234) @@ -29,7 +29,6 @@ <bean class="org.nuiton.web.struts2.I18nTextProvider" name="i18nTextProvider" type="com.opensymphony.xwork2.TextProvider" /> <constant name="struts.convention.default.parent.package" value="faxtomail" /> - <constant name="struts.objectFactory" value="com.franciaflex.faxtomail.web.FaxToMailStrutsObjectFactory" /> <constant name="struts.xworkTextProvider" value="i18nTextProvider" /> <constant name="struts.multipart.maxSize" value="10485760" />

1 0

r233 - trunk/faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com June 19, 2014

June 19, 2014

Author: echatellier Date: 2014-06-19 16:55:43 +0200 (Thu, 19 Jun 2014) New Revision: 233 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/233 Log: Readd sortable module Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-19 14:23:33 UTC (rev 232) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-19 14:55:43 UTC (rev 233) @@ -22,7 +22,7 @@ * #L% */ -var ConfigurationModule = angular.module('ConfigurationModule', ['FaxToMail', 'ui.tree', 'localytics.directives', 'ui.select2.sortable']); +var ConfigurationModule = angular.module('ConfigurationModule', ['FaxToMail', 'ui.tree', 'ui.sortable', 'localytics.directives', 'ui.select2.sortable']); /** * Global configuration controller.

1 0

r232 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing
by echatellier＠users.forge.codelutin.com June 19, 2014

June 19, 2014

Author: echatellier Date: 2014-06-19 16:23:33 +0200 (Thu, 19 Jun 2014) New Revision: 232 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/232 Log: Ajout d'une fenetre de login si vraiment l'utilisateur ne peut pas ?\195?\170tre authentifi?\195?\169. Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-06-19 13:08:44 UTC (rev 231) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-06-19 14:23:33 UTC (rev 232) @@ -49,9 +49,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractBean; +import org.jdesktop.swingx.JXLoginPane; +import org.jdesktop.swingx.JXLoginPane.JXLoginDialog; +import org.jdesktop.swingx.JXLoginPane.Status; +import org.jdesktop.swingx.auth.LoginService; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.jaxx.application.ApplicationConfiguration; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.swing.ApplicationUIContext; import org.nuiton.jaxx.application.swing.action.ApplicationActionEngine; import org.nuiton.jaxx.application.swing.action.ApplicationActionFactory; @@ -348,28 +353,71 @@ I18n.init(new ClassPathI18nInitializer(), i18nLocale); - // try to get user from ldap + // try to autologin user from username of current X session + autologinUser(); + + Configuration config = getConfigurationService().getConfiguration(); + setFaxToMailConfiguration(config); + + //--------------------------------------------------------------------// + // init action UI + //--------------------------------------------------------------------// + setActionUI(new ApplicationActionUI(null, this)); + } + + /** + * Recupere l'utilisateur connecté ou demande les identifiants à l'utilisateur. + */ + protected void autologinUser() { + + String principal = getLoggedInUsername(); + + // l'authentification par defaut se fait par trigramme try { - String principal = getLoggedInUsername(); FaxToMailUser currentUser = getLdapService().getUserFromPrincipal(principal); if (log.isInfoEnabled()) { log.info("Connected as " + currentUser.getFirstName() + " " + currentUser.getLastName()); } setCurrentUser(currentUser); } catch (AuthenticationException ex) { - throw new RuntimeException(ex); + if (log.isWarnEnabled()) { + log.warn("Can't anthenticate user", ex); + } } - - Configuration config = getConfigurationService().getConfiguration(); - setFaxToMailConfiguration(config); + // si ca n'a pas fonctionné, on retente par login mot de passe + while (getCurrentUser() == null) { + JXLoginPane pane = new JXLoginPane(); + pane.setLoginService(new LoginService() { + @Override + public boolean authenticate(String name, char[] password, String server) throws Exception { + boolean result = false; + try { + FaxToMailUser user = getLdapService().authenticateUser(name, String.valueOf(password)); + setCurrentUser(user); + result = true; + } catch (AuthenticationException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't anthenticate user", ex); + } + } + return result; + } + }); -// //--------------------------------------------------------------------// -// // init action UI -// //--------------------------------------------------------------------// - setActionUI(new ApplicationActionUI(null, this)); + // show login dialog + Status loginStatus = JXLoginPane.showLoginDialog(null, pane); + if (loginStatus == Status.CANCELLED) { + throw new ApplicationTechnicalException("Authentication canceled"); + } + } } + /** + * Retourne l'utilsateur connecté sur la session utilsateur (ou a defaut un utilisateur de test). + * + * @return trigramme + */ protected String getLoggedInUsername() { String result = getConfig().getLdapTestPrincipal(); if (StringUtils.isBlank(result)) {

1 0