Faxtomail-commits

Download

faxtomail-commits@list.forge.codelutin.com

October 2014

3 participants
28 discussions

r664 - tags
by maven-release＠users.forge.codelutin.com 03 Oct '14

03 Oct '14

Author: maven-release Date: 2014-10-03 11:25:49 +0200 (Fri, 03 Oct 2014) New Revision: 664 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/664 Log: [maven-release-plugin] copy for tag faxtomail-1.0-rc-4 Added: tags/faxtomail-1.0-rc-4/

1 0

r663 - in trunk: . faxtomail-persistence faxtomail-service faxtomail-ui-swing faxtomail-ui-web
by maven-release＠users.forge.codelutin.com 03 Oct '14

03 Oct '14

Author: maven-release Date: 2014-10-03 11:25:24 +0200 (Fri, 03 Oct 2014) New Revision: 663 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/663 Log: [maven-release-plugin] prepare release faxtomail-1.0-rc-4 Modified: trunk/faxtomail-persistence/pom.xml trunk/faxtomail-service/pom.xml trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-web/pom.xml trunk/pom.xml Modified: trunk/faxtomail-persistence/pom.xml =================================================================== --- trunk/faxtomail-persistence/pom.xml 2014-10-03 09:14:56 UTC (rev 662) +++ trunk/faxtomail-persistence/pom.xml 2014-10-03 09:25:24 UTC (rev 663) @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.0-rc-4-SNAPSHOT</version> + <version>1.0-rc-4</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-10-03 09:14:56 UTC (rev 662) +++ trunk/faxtomail-service/pom.xml 2014-10-03 09:25:24 UTC (rev 663) @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.0-rc-4-SNAPSHOT</version> + <version>1.0-rc-4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-10-03 09:14:56 UTC (rev 662) +++ trunk/faxtomail-ui-swing/pom.xml 2014-10-03 09:25:24 UTC (rev 663) @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.0-rc-4-SNAPSHOT</version> + <version>1.0-rc-4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-10-03 09:14:56 UTC (rev 662) +++ trunk/faxtomail-ui-web/pom.xml 2014-10-03 09:25:24 UTC (rev 663) @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.0-rc-4-SNAPSHOT</version> + <version>1.0-rc-4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-03 09:14:56 UTC (rev 662) +++ trunk/pom.xml 2014-10-03 09:25:24 UTC (rev 663) @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.0-rc-4-SNAPSHOT</version> + <version>1.0-rc-4</version> <packaging>pom</packaging> <name>FaxToMail</name> @@ -71,9 +71,9 @@ </modules> <scm> - <url>https://svn.codelutin.com/faxtomail/trunk</url> - <connection>scm:svn:https://svn.codelutin.com/faxtomail/trunk</connection> - <developerConnection>scm:svn:http://svn.codelutin.com/faxtomail/trunk</developerConnection> + <url>https://svn.codelutin.com/faxtomail/tags/faxtomail-1.0-rc-4</url> + <connection>scm:svn:https://svn.codelutin.com/faxtomail/tags/faxtomail-1.0-rc-4</connection> + <developerConnection>scm:svn:http://svn.codelutin.com/faxtomail/tags/faxtomail-1.0-rc-4</developerConnection> </scm> <distributionManagement> <site>

1 0

r662 - in trunk: . faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports faxtomail-service/src/main/resources/db/migration/h2 faxtomail-service/src/main/resources/db/migration/postgres faxtomail-service/src/main/resources/db/migration/sqlserver faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/m
by kmorin＠users.forge.codelutin.com 03 Oct '14

03 Oct '14

Author: kmorin Date: 2014-10-03 11:14:56 +0200 (Fri, 03 Oct 2014) New Revision: 662 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/662 Log: - ajout de la soci?\195?\169t?\195?\169 dans le dossier de mail - passage a la version stable de jaxx - ajout propri?\195?\169t?\195?\169 ?\195?\160 ignorer sur les demandes Added: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_662__add_company_in_mailfolder.sql trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_662__add_company_in_mailfolder.sql trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_662__add_company_in_mailfolder.sql Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 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 trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js trunk/pom.xml Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) 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-10-02 15:02:04 UTC (rev 661) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-10-03 09:14:56 UTC (rev 662) @@ -32,9 +32,9 @@ * @author Kevin Morin (Code Lutin) */ public interface ClientService extends FaxToMailService { - Client getClientForEmailAddress(String emailAddress, Email email); + Client getClientForEmailAddress(String emailAddress, Email email, String company); - Client getClientForCode(String code); + Client getClientForCode(String code, String company); void updateNewClients(); } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java 2014-10-02 15:02:04 UTC (rev 661) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java 2014-10-03 09:14:56 UTC (rev 662) @@ -30,12 +30,14 @@ import java.sql.Statement; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.map.MultiKeyMap; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.topia.persistence.support.TopiaSqlWork; @@ -65,10 +67,11 @@ * * @param emailAddress sender address * @param email email + * @param company company of the client * @return client for emailAddress (can be {@code null}) */ @Override - public Client getClientForEmailAddress(String emailAddress, Email email) { + public Client getClientForEmailAddress(String emailAddress, Email email, String company) { Preconditions.checkNotNull(email); Preconditions.checkNotNull(emailAddress); @@ -91,7 +94,13 @@ } if (CollectionUtils.isNotEmpty(clients)) { - client = clients.get(0); + int i = 0; + while (client == null && i < clients.size()) { + Client c = clients.get(i); + if (StringUtils.isBlank(company) || Objects.equals(company, c.getCompany())) { + client = c; + } + } } } @@ -101,19 +110,22 @@ } /** - * Recherche un client par code. + * Recherche un client par code et société. * - * FIXME echatellier 20140709 cette methodé récupére un client au hazard car le code peut être dupliqué par société - * * @param code client code - * @return un client au hasard + * @param company + * @return le client pour la société */ @Override - public Client getClientForCode(String code) { + public Client getClientForCode(String code, String company) { ClientTopiaDao clientDao = getPersistenceContext().getClientDao(); Client client = null; if (StringUtils.isNotBlank(code)) { - client = clientDao.forCodeEquals(code).findAnyOrNull(); + TopiaQueryBuilderAddCriteriaOrRunQueryStep<Client> ctqbacorqs = clientDao.forCodeEquals(code); + if (StringUtils.isNotBlank(company)) { + ctqbacorqs = ctqbacorqs.addEquals(Client.PROPERTY_COMPANY, company); + } + client = ctqbacorqs.findAnyOrNull(); } return client; } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-10-02 15:02:04 UTC (rev 661) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-10-03 09:14:56 UTC (rev 662) @@ -232,10 +232,16 @@ EmailTopiaDao dao = getPersistenceContext().getEmailDao(); HistoryTopiaDao historyDao = getPersistenceContext().getHistoryDao(); + MailFolder folder = email.getMailFolder(); + while (!folder.isUseCurrentLevelCompany() && folder.getParent() != null) { + folder = folder.getParent(); + } + String company = folder.getCompany(); + // if client code is null, do not manage client at all Client client = null; if (StringUtils.isNotBlank(clientCode)) { - client = getClientService().getClientForCode(clientCode); + client = getClientService().getClientForCode(clientCode, company); if (client == null) { String message = t("faxtomail.service.email.save.clientCode.error", clientCode); throw new InvalidClientException(message); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java 2014-10-02 15:02:04 UTC (rev 661) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java 2014-10-03 09:14:56 UTC (rev 662) @@ -78,7 +78,14 @@ newMandatoryColumn("receptionDate", Email.PROPERTY_RECEPTION_DATE, dateValueParser); newMandatoryColumn("projectReference", Email.PROPERTY_PROJECT_REFERENCE); - newMandatoryColumn("sender", Email.PROPERTY_SENDER); + newMandatoryColumn("sender", Email.PROPERTY_SENDER, new ValueParser<Object>() { + @Override + public Object parse(String value) throws ParseException { + value = value.replaceFirst("^.*<(.*)>$", "$1"); + value = value.toLowerCase(); + return value; + } + }); newMandatoryColumn("fax", Email.PROPERTY_FAX, Common.PRIMITIVE_BOOLEAN); newMandatoryColumn("recipient", Email.PROPERTY_RECIPIENT); newMandatoryColumn("object", Email.PROPERTY_OBJECT); Added: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_662__add_company_in_mailfolder.sql =================================================================== --- trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_662__add_company_in_mailfolder.sql (rev 0) +++ trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_662__add_company_in_mailfolder.sql 2014-10-03 09:14:56 UTC (rev 662) @@ -0,0 +1,5 @@ + +-- add mail folder level configuration +alter table mailfolder add useCurrentLevelCompany boolean; +alter table mailfolder add company longvarchar; +update mailfolder set useCurrentLevelCompany = 'f'; \ No newline at end of file Added: trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_662__add_company_in_mailfolder.sql =================================================================== --- trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_662__add_company_in_mailfolder.sql (rev 0) +++ trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_662__add_company_in_mailfolder.sql 2014-10-03 09:14:56 UTC (rev 662) @@ -0,0 +1,5 @@ + +-- add mail folder level configuration +alter table mailfolder add useCurrentLevelCompany boolean; +alter table mailfolder add company text; +update mailfolder set useCurrentLevelCompany = 'f'; \ No newline at end of file Added: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_662__add_company_in_mailfolder.sql =================================================================== --- trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_662__add_company_in_mailfolder.sql (rev 0) +++ trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_662__add_company_in_mailfolder.sql 2014-10-03 09:14:56 UTC (rev 662) @@ -0,0 +1,6 @@ + +-- add mail folder level configuration +alter table mailfolder add useCurrentLevelCompany bit; +alter table mailfolder add company varchar(MAX); +GO +update mailfolder set useCurrentLevelCompany = 0; \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-10-02 15:02:04 UTC (rev 661) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-10-03 09:14:56 UTC (rev 662) @@ -426,6 +426,7 @@ result.add(Email.PROPERTY_HISTORY); result.add(DemandeUIModel.PROPERTY_GROUPED_DEMANDES); result.add(Email.PROPERTY_REPLIES); + result.add(DemandeUIModel.PROPERTY_VALID_RANGE_ROW_MODELS); return result; } 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-10-02 15:02:04 UTC (rev 661) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-10-03 09:14:56 UTC (rev 662) @@ -146,7 +146,6 @@ boolean editable = model.isEditable(); boolean archived = model.getArchiveDate() != null; - boolean transmitEnabled = editable && isActionEnabled(model, MailAction.TRANSMIT, config); getModel().setTransmitEnabled(transmitEnabled); Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-10-02 15:02:04 UTC (rev 661) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-10-03 09:14:56 UTC (rev 662) @@ -5,7 +5,7 @@ application.action.create.error= application.error.ui.business.warning= faxtomail.about.bottomText=Copyright %s - %s - version %s -faxtomail.about.message=<h3>FaxToMail</h3><p><strong>Outil de gestion d'emails.</strong></p><br/><p>Ce logiciel permet de router les emails reçus vers des dossiers et de les transformer en formulaires. Ils peuvent être déplacés entre dossiers pour êtres remplis par différentes personnes puis archivés.</p><p>Ce projet a été initiée en 2014 par le groupe MAC et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.</p><hr/><br/><p>Pour plus d'informations, vous pouvez visiter le <a href\="http\://doc.codelutin.com/faxtomail">site du projet</a>.</p><p>Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/faxtomail">forge.codelutin.com</a>.</p> +faxtomail.about.message=<h3>FaxToMail</h3><p><strong>Outil de gestion d'emails.</strong></p><br/><p>Ce logiciel permet de router les emails reçus vers des dossiers et de les transformer en formulaires. Ils peuvent être déplacés entre dossiers pour êtres remplis par différentes personnes puis archivés.</p><p>Ce projet a été initiée en 2014 par le groupe MAC et réalisé par la société Code Lutin.</p> faxtomail.about.title=À propos de FaxToMail faxtomail.action.archive.tip=Archiver l'élément faxtomail.action.attachment.edit.tip=Edition du fichier %s 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-10-02 15:02:04 UTC (rev 661) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-10-03 09:14:56 UTC (rev 662) @@ -62,6 +62,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -311,6 +312,13 @@ continue; } + // find company of the filter folder + MailFolder filterFolder = filter.getMailFolder(); + while (!filterFolder.isUseCurrentLevelCompany() && filterFolder.getParent() != null) { + filterFolder = filterFolder.getParent(); + } + String company = filterFolder.getCompany(); + Address[] addresses = message.getFrom(); if (addresses != null && addresses.length > 0) { String sender = addresses[0].toString(); @@ -320,7 +328,7 @@ sender = sender.toLowerCase(); // Identification du client en fonction du numéro de fax appelant ou de l'adresse e-mail émettrice - Client client = clientService.getClientForEmailAddress(sender, email); + Client client = clientService.getClientForEmailAddress(sender, email, company); modifiedProperties.add(Email.PROPERTY_SENDER); String object; 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-10-02 15:02:04 UTC (rev 661) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-10-03 09:14:56 UTC (rev 662) @@ -276,7 +276,20 @@ </div> <div id="collapse0" class="panel-collapse collapse" ng-form="generalForm"> <div class="panel-body"> + <div class="form-group" ng-if="selectedMailFolder.$parent"> + <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelCompany" ng-value="false" /> + Hériter de la société :</label> + <input type="text" class="form-control" disabled + ng-model="parentScopeValues.company" ng-if="!selectedMailFolder.useCurrentLevelCompany"> + </div> <div class="form-group"> + <label> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelCompany" ng-value="true" ng-if="selectedMailFolder.$parent" /> + Définir la société :</label> + <input name="company" class="form-control" ng-model="selectedMailFolder.company" ng-if="selectedMailFolder.useCurrentLevelCompany || !selectedMailFolder.$parent"> + </div> + + <div class="form-group"> <label class="control-label">Autoriser le déplacement de demandes vers ce dossier ?</label><br /> <label class="radio-inline"> <input type="radio" Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-10-02 15:02:04 UTC (rev 661) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-10-03 09:14:56 UTC (rev 662) @@ -375,6 +375,7 @@ useCurrentLevelEdiFolder: true, useCurrentLevelRejectResponseMessage: true, useCurrentLevelRejectResponseMailAddress: true, + useCurrentLevelCompany: true, archiveFolder: false }; @@ -407,6 +408,7 @@ useCurrentLevelEdiFolder: false, useCurrentLevelRejectResponseMessage: false, useCurrentLevelRejectResponseMailAddress: false, + useCurrentLevelCompany: false, archiveFolder: false }; @@ -442,6 +444,7 @@ useCurrentLevelEdiFolder: false, useCurrentLevelRejectResponseMessage: false, useCurrentLevelRejectResponseMailAddress: false, + useCurrentLevelCompany: false, useCurrentLevelDemandType: false, useCurrentLevelRange: false, archiveFolder: true @@ -701,6 +704,9 @@ if (angular.isUndefined($scope.parentScopeValues.rejectResponseMessage)) { $scope.parentScopeValues.rejectResponseMessage= folder.rejectResponseMessage; } + if (angular.isUndefined($scope.parentScopeValues.company)) { + $scope.parentScopeValues.company = folder.company; + } if ((!$scope.parentScopeValues.folderTableColumns || $scope.parentScopeValues.folderTableColumns.length == 0) && folder.folderTableColumns) { $scope.parentScopeValues.folderTableColumns = folder.folderTableColumns; } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-02 15:02:04 UTC (rev 661) +++ trunk/pom.xml 2014-10-03 09:14:56 UTC (rev 662) @@ -110,7 +110,7 @@ <h2Version>1.3.176</h2Version> <guavaVersion>18.0</guavaVersion> - <jaxxVersion>2.14-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.14</jaxxVersion>  <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion>

1 0

r661 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: content/demande util
by kmorin＠users.forge.codelutin.com 02 Oct '14

02 Oct '14

Author: kmorin Date: 2014-10-02 17:02:04 +0200 (Thu, 02 Oct 2014) New Revision: 661 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/661 Log: ajout du rechargement sur la touche f5 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-10-02 15:02:04 UTC (rev 661) @@ -24,11 +24,11 @@ import static org.nuiton.i18n.I18n.t; -import java.awt.Color; -import java.awt.Component; -import java.awt.Dimension; +import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -40,11 +40,7 @@ import java.util.Map; import java.util.Set; -import javax.swing.JComponent; -import javax.swing.JPopupMenu; -import javax.swing.JTree; -import javax.swing.ListSelectionModel; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.event.TreeSelectionEvent; @@ -73,6 +69,7 @@ import org.jdesktop.swingx.decorator.ComponentAdapter; import org.jdesktop.swingx.decorator.HighlightPredicate; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.action.ApplicationUIAction; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.jaxx.application.swing.util.CloseableUI; @@ -112,6 +109,8 @@ /** Logger. */ private static final Log log = LogFactory.getLog(DemandeListUIHandler.class); + public static final String REFRESH_KEY = "F5"; + public static final String REFRESH_FOLDER_ACTION = "refreshFolder"; protected Configuration config; @@ -294,6 +293,13 @@ updateResultPerPage(e); } }); + + // add refresh shortcut + JRootPane rootPane = getContext().getMainUI().getRootPane(); + rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(REFRESH_KEY), REFRESH_FOLDER_ACTION); + ApplicationUIAction<LoadFolderEmailsAction> refreshAction = getContext().getActionFactory().createUIAction(this, LoadFolderEmailsAction.class); + rootPane.getActionMap().put(REFRESH_FOLDER_ACTION, refreshAction); + } public void initTableFilter() { @@ -451,6 +457,11 @@ } getContext().setExpandedFolders(folders); + // remove refresh shortcut + JRootPane rootPane = getContext().getMainUI().getRootPane(); + rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).remove(KeyStroke.getKeyStroke(REFRESH_KEY)); + rootPane.getActionMap().remove(REFRESH_FOLDER_ACTION); + clearValidators(); } 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-10-02 11:30:33 UTC (rev 660) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-10-02 15:02:04 UTC (rev 661) @@ -219,6 +219,7 @@ foreground = Color.GRAY; } component.setForeground(foreground); + } return component;

1 0

02 Oct '14

Author: kmorin Date: 2014-10-02 13:30:33 +0200 (Thu, 02 Oct 2014) New Revision: 660 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/660 Log: - Mise a jour du copyright - correction des conditions d'?\195?\169ditabilit?\195?\169 - Suppression des licenses et tiers dans ?\195?\160 propos - correction reprise des archives Added: trunk/faxtomail-ui-swing/src/main/resources/splashscreen.png Removed: trunk/faxtomail-ui-swing/src/main/resources/splashscreen.jpg Modified: trunk/faxtomail-persistence/pom.xml trunk/faxtomail-persistence/src/license/THIRD-PARTY.properties trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationProvider.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.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-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientImpl.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientTopiaDao.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/DemandStatus.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EdiReturn.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailImpl.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailProtocol.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ExtensionCommandTopiaDao.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryImpl.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryType.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClient.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/WaitingStateTopiaDao.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumListUserType.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumSetUserType.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailActionEnumSetUserType.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailFieldEnumListUserType.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailFieldEnumSetUserType.java trunk/faxtomail-persistence/src/main/resources/faxToMail.properties trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-service/pom.xml trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailDecorator.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceFactory.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceInvocationHandler.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.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/ClientServiceImpl.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/ConfigurationServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.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/MailFolderServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/AlreadyLockedMailException.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/InvalidClientException.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportBean.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportBean.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailFilterImportModel.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/WaitingStateImportModel.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/AuthenticationException.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/migration/FaxtomailFlywayMigrationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java trunk/faxtomail-service/src/main/resources/com/franciaflex/faxtomail/persistence/entities/Email-error-validation.xml trunk/faxtomail-service/src/main/resources/validators.xml trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java trunk/faxtomail-service/src/test/resources/log4j2.xml trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties trunk/faxtomail-ui-swing/src/main/assembly/faxtomail-full-component.xml trunk/faxtomail-ui-swing/src/main/assembly/full-linux-i586.xml trunk/faxtomail-ui-swing/src/main/assembly/full-linux-x64.xml trunk/faxtomail-ui-swing/src/main/assembly/full-windows-i586.xml trunk/faxtomail-ui-swing/src/main/assembly/full-windows-x64.xml trunk/faxtomail-ui-swing/src/main/assembly/full/faxtomail.sh trunk/faxtomail-ui-swing/src/main/assembly/i18n.xml trunk/faxtomail-ui-swing/src/main/assembly/min/launch.sh trunk/faxtomail-ui-swing/src/main/assembly/standalone.xml trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailActionFactory.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.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/RunFaxToMail.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractMainUIFaxToMailAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.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/ArchiveFromListAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.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/GoToPreviousScreenAction.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/LoadFolderEmailsAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReloadFaxToMailAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReplyAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.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/actions/ShowDemandeListAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/Common.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 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/AttachmentCellEditor.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellRenderer.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.jaxx 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/attachment/AttachmentItem.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.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/DemandeUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.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/DemandesUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx 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/QuantitiesByRangeUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUI.jaxx 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/ButtonEmailGroup.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupCellRenderer.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUI.jaxx 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/history/ButtonHistory.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItem.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItem.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItemModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.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/DemandRepliesUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.jaxx 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/PDFEditorCrossUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.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/AttachmentToPrintChooserUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.jaxx 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/reply/AttachmentItem.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx 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/SearchUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx 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/SearchUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailBeanUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.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/AbstractToolbarPopupHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.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/FaxToMailExceptionHandler.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/FaxToMailUIUtil.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-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/PaginationComboModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/RemoveablePropertyChangeListener.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/UIMessageNotifier.java trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailLoginInterceptor.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/IndexAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.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/ConfigurationAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationJsonAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.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/AbstractFaxToMailJob.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 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/json/HibernateProxyTypeAdapter.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/TopiaEntityAdapter.java trunk/faxtomail-ui-web/src/main/resources/log4j2.xml trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties trunk/faxtomail-ui-web/src/main/resources/quartz.properties trunk/faxtomail-ui-web/src/main/resources/struts.properties trunk/faxtomail-ui-web/src/main/resources/struts.xml trunk/faxtomail-ui-web/src/main/resources/validators.xml trunk/faxtomail-ui-web/src/main/resources/xwork-conversion.properties 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/import-archive-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-wait.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/login-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators.xml trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml trunk/faxtomail-ui-web/src/main/webapp/css/faxtomail.css trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js trunk/pom.xml trunk/src/site/rst/import.rst trunk/src/site/rst/index.rst trunk/src/site/rst/install.rst trunk/src/site/rst/mssql.rst trunk/src/site/site_fr.xml Modified: trunk/faxtomail-persistence/pom.xml =================================================================== --- trunk/faxtomail-persistence/pom.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/pom.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -3,7 +3,7 @@ #%L FaxToMail :: Persistence %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 @@ -162,4 +162,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> Modified: trunk/faxtomail-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/faxtomail-persistence/src/license/THIRD-PARTY.properties 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/license/THIRD-PARTY.properties 2014-10-02 11:30:33 UTC (rev 660) @@ -1,3 +1,24 @@ +### +# #%L +# FaxToMail :: Persistence +# %% +# Copyright (C) 2014 Mac-Groupe, 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% +### # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 Ministère des Affaires sociales et de la Santé + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 Ministère des Affaires sociales et de la Santé + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationProvider.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationProvider.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationProvider.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -59,4 +59,4 @@ public ConfigActionDef[] getActions() { return new ConfigActionDef[0]; } -} \ No newline at end of file +} 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientTopiaDao.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientTopiaDao.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/DemandStatus.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/DemandStatus.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/DemandStatus.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EdiReturn.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EdiReturn.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EdiReturn.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id: EmailFilter.java 598 2014-09-03 13:58:29Z echatellier $ * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-persistence/src/main/ja… $ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id:$ * $HeadURL:$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailProtocol.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailProtocol.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailProtocol.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ExtensionCommandTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ExtensionCommandTopiaDao.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ExtensionCommandTopiaDao.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryType.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryType.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryType.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClient.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClient.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClient.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/WaitingStateTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/WaitingStateTopiaDao.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/WaitingStateTopiaDao.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumListUserType.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumListUserType.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumListUserType.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumSetUserType.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumSetUserType.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumSetUserType.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailActionEnumSetUserType.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailActionEnumSetUserType.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailActionEnumSetUserType.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailFieldEnumListUserType.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailFieldEnumListUserType.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailFieldEnumListUserType.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailFieldEnumSetUserType.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailFieldEnumSetUserType.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailFieldEnumSetUserType.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-persistence/src/main/resources/faxToMail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/resources/faxToMail.properties 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/resources/faxToMail.properties 2014-10-02 11:30:33 UTC (rev 660) @@ -4,18 +4,18 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2014 Franciaflex +# Copyright (C) 2014 Mac-Groupe, 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>. Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2014 Franciaflex, Code Lutin +# Copyright (C) 2014 Mac-Groupe, 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 @@ -58,7 +58,7 @@ com.franciaflex.faxtomail.persistence.entities.EmailAccount.attribute.login.tagvalue.naturalId=true -#�Configuration +#�Configuration com.franciaflex.faxtomail.persistence.entities.Configuration.attribute.searchDisplayColumns.tagvalue.hibernateAttributeType=com.franciaflex.faxtomail.persistence.hibernate.MailFieldEnumListUserType com.franciaflex.faxtomail.persistence.entities.Configuration.attribute.invalidFormDisabledActions.tagvalue.hibernateAttributeType=com.franciaflex.faxtomail.persistence.hibernate.MailActionEnumSetUserType Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/pom.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -3,7 +3,7 @@ #%L FaxToMail :: Service %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -231,4 +231,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailDecorator.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailDecorator.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailDecorator.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailService.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailService.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceFactory.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceFactory.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceFactory.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceInvocationHandler.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceInvocationHandler.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceInvocationHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -1470,7 +1470,12 @@ if (archiveBean.getAttachmentPaths() != null) { Iterable<String> itAttachmentPaths = Splitter.on(',').omitEmptyStrings().trimResults().split(archiveBean.getAttachmentPaths()); for (String attachmentPath : itAttachmentPaths) { - File attFile = new File(attachmentBase, attachmentPath); + File attFile; + if (attachmentBase != null) { + attFile = new File(attachmentBase, attachmentPath); + } else { + attFile = new File(attachmentPath); + } if (!attFile.isFile()) { throw new RuntimeException("Missing file " + attFile.getAbsolutePath()); } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationServiceImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationServiceImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/AlreadyLockedMailException.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/AlreadyLockedMailException.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/AlreadyLockedMailException.java 2014-10-02 11:30:33 UTC (rev 660) @@ -8,7 +8,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/InvalidClientException.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/InvalidClientException.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/InvalidClientException.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportBean.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportBean.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportBean.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportBean.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportBean.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportBean.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailFilterImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailFilterImportModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailFilterImportModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/WaitingStateImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/WaitingStateImportModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/WaitingStateImportModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/AuthenticationException.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/AuthenticationException.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/AuthenticationException.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/migration/FaxtomailFlywayMigrationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/migration/FaxtomailFlywayMigrationService.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/migration/FaxtomailFlywayMigrationService.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -39,4 +39,4 @@ setRegex(EMAIL_ADDRESS_PATTERN); } -} \ No newline at end of file +} Modified: trunk/faxtomail-service/src/main/resources/com/franciaflex/faxtomail/persistence/entities/Email-error-validation.xml =================================================================== --- trunk/faxtomail-service/src/main/resources/com/franciaflex/faxtomail/persistence/entities/Email-error-validation.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/resources/com/franciaflex/faxtomail/persistence/entities/Email-error-validation.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/main/resources/validators.xml =================================================================== --- trunk/faxtomail-service/src/main/resources/validators.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/main/resources/validators.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-service/src/test/resources/log4j2.xml =================================================================== --- trunk/faxtomail-service/src/test/resources/log4j2.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-service/src/test/resources/log4j2.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -39,4 +39,4 @@ <AppenderRef ref="Console" /> </Root> </Loggers> -</Configuration> \ No newline at end of file +</Configuration> Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/pom.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -3,7 +3,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -761,4 +761,4 @@ </build> </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties 2014-10-02 11:30:33 UTC (rev 660) @@ -1,3 +1,24 @@ +### +# #%L +# FaxToMail :: UI +# %% +# Copyright (C) 2014 Mac-Groupe, 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% +### # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : Modified: trunk/faxtomail-ui-swing/src/main/assembly/faxtomail-full-component.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/assembly/faxtomail-full-component.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/assembly/faxtomail-full-component.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -3,7 +3,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/assembly/full/faxtomail.sh =================================================================== --- trunk/faxtomail-ui-swing/src/main/assembly/full/faxtomail.sh 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/assembly/full/faxtomail.sh 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ # #%L # FaxToMail :: UI # %% -# Copyright (C) 2014 Franciaflex +# Copyright (C) 2014 Mac-Groupe, 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 @@ -48,4 +48,4 @@ # quit now! exit $exitcode fi -done \ No newline at end of file +done Modified: trunk/faxtomail-ui-swing/src/main/assembly/full-linux-i586.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/assembly/full-linux-i586.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/assembly/full-linux-i586.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -3,7 +3,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/assembly/full-linux-x64.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/assembly/full-linux-x64.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/assembly/full-linux-x64.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -3,7 +3,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/assembly/full-windows-i586.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/assembly/full-windows-i586.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/assembly/full-windows-i586.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -3,7 +3,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/assembly/full-windows-x64.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/assembly/full-windows-x64.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/assembly/full-windows-x64.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -3,7 +3,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/assembly/i18n.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/assembly/i18n.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/assembly/i18n.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -2,7 +2,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 @@ -50,4 +50,4 @@ </fileSet> </fileSets> -</assembly> \ No newline at end of file +</assembly> Modified: trunk/faxtomail-ui-swing/src/main/assembly/min/launch.sh =================================================================== --- trunk/faxtomail-ui-swing/src/main/assembly/min/launch.sh 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/assembly/min/launch.sh 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ # #%L # FaxToMail :: UI # %% -# Copyright (C) 2014 Franciaflex +# Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/assembly/standalone.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/assembly/standalone.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/assembly/standalone.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -3,7 +3,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties 2014-10-02 11:30:33 UTC (rev 660) @@ -1,4 +1,25 @@ +### +# #%L +# FaxToMail :: UI +# %% +# Copyright (C) 2014 Mac-Groupe, 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% +### faxtomail.version=${project.version} faxtomail.site.url=${project.url} faxtomail.inceptionYear=${project.inceptionYear} -faxtomail.organizationName=${license.organizationName} \ No newline at end of file +faxtomail.organizationName=${license.organizationName} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailActionFactory.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailActionFactory.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailActionFactory.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 @@ -81,7 +81,7 @@ font, new Point(20, 40), new Color(200, 20, 40)); - final SplashScreen splashScreen = new SplashScreen("/splashscreen.jpg", title); + final SplashScreen splashScreen = new SplashScreen("/splashscreen.png", title); splashScreen.setRemanence(500); try { @@ -178,4 +178,4 @@ } } -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 @@ -22,10 +22,13 @@ * #L% */ +import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.FaxToMailScreen; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.content.MainUI; import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import jaxx.runtime.SwingUtil; import jaxx.runtime.context.JAXXContextEntryDef; @@ -100,4 +103,19 @@ context.setScreen(screen); } + @Override + public void postSuccessAction() { + super.postSuccessAction(); + + if (screen == FaxToMailScreen.LIST) { + MailFolder currentMailFolder = getContext().getCurrentMailFolder(); + DemandeUIModel currentEmail = getContext().getCurrentEmail(); + + if (currentMailFolder == null && currentEmail != null) { + currentMailFolder = currentEmail.getMailFolder(); + } + DemandeListUI listUI = (DemandeListUI) getHandler().getCurrentBody(); + listUI.getModel().setSelectedFolder(currentMailFolder); + } + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractMainUIFaxToMailAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractMainUIFaxToMailAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractMainUIFaxToMailAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveFromListAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveFromListAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveFromListAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -91,4 +91,4 @@ super.postSuccessAction(); handler.openDialog(getUI(), t("faxtomail.quantitiesByRange.title"), new Dimension(350, 300)); } -} \ No newline at end of file +} 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -96,4 +96,4 @@ frame = null; } } -} \ No newline at end of file +} 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GoToPreviousScreenAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GoToPreviousScreenAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GoToPreviousScreenAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GroupAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -42,6 +42,7 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.pagination.PaginationResult; @@ -71,23 +72,32 @@ @Override public boolean prepareAction() throws Exception { + boolean result; + DemandeListUIModel model = getModel(); MailFolder folder = model.getSelectedFolder(); - final JXTable dataTable = getUI().getDataTable(); - setActionDescription(t("faxtomail.action.loadFolderEmails.tip", folder.getName())); + if (folder == null) { + result = false; - // change name to save the state of the column width for every folder - // (as every folder can have a different header) - getContext().getSwingSession().updateState(); - String columns = handler.populateColumnModel(dataTable, false); - dataTable.setName("dataTable" + columns); - getContext().getSwingSession().add(dataTable, true); + } else { + final JXTable dataTable = getUI().getDataTable(); - // fixes #5528 filtre sur les colonnes : il manque l'icone qui indique que la colonne est filtrée - handler.initTableFilter(); + setActionDescription(t("faxtomail.action.loadFolderEmails.tip", folder.getName())); - return true; + // change name to save the state of the column width for every folder + // (as every folder can have a different header) + getContext().getSwingSession().updateState(); + String columns = handler.populateColumnModel(dataTable, false); + dataTable.setName("dataTable" + columns); + getContext().getSwingSession().add(dataTable, true); + + // fixes #5528 filtre sur les colonnes : il manque l'icone qui indique que la colonne est filtrée + handler.initTableFilter(); + result = true; + } + + return result; } @Override @@ -138,7 +148,7 @@ demand.setValid(handler.isDemandeValid(demand)); demand.setMailFolder(folder); - demand.setEditable(folder.isFolderWritable()); + demand.setEditable(folder.isFolderWritable() && demand.getDemandStatus().isEditableStatus()); WaitingState waitingState = email.getWaitingState(); if (waitingState != null) { demand.setWaitingState(waitingStateById.get(waitingState.getTopiaId())); @@ -152,6 +162,24 @@ } @Override + public void postSuccessAction() { + super.postSuccessAction(); + + DemandeUIModel currentEmail = getContext().getCurrentEmail(); + + if (currentEmail != null) { + JXTable dataTable = getUI().getDataTable(); + AbstractApplicationTableModel<DemandeUIModel> dataTableModel = + (AbstractApplicationTableModel<DemandeUIModel>) dataTable.getModel(); + int row = dataTableModel.getRowIndex(currentEmail); + if (row > 0) { + dataTable.setRowSelectionInterval(row, row); + dataTable.scrollRowToVisible(row); + } + } + } + + @Override protected void releaseAction() { super.releaseAction(); getUI().getNavigationTree().setEnabled(true); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -153,9 +153,11 @@ demandToOpen.fromEntity(email); MailFolder folder = demandToOpen.getMailFolder(); - demandToOpen.setEditable(demandToOpen.getArchiveDate() == null - && folder.isFolderWritable() - && demandToOpen.getDemandStatus().isEditableStatus()); + if (demandToOpen.getArchiveDate() != null + || !folder.isFolderWritable() + || !demandToOpen.getDemandStatus().isEditableStatus()) { + demandToOpen.setEditable(false); + } demandToOpen.setCloseable(true); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReloadFaxToMailAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReloadFaxToMailAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReloadFaxToMailAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 @@ -46,4 +46,4 @@ RunFaxToMail.closeFaxToMail(getHandler(), RunFaxToMail.UPATE_EXIT_CODE); } -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReplyAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReplyAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReplyAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -46,6 +46,8 @@ import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.pagination.PaginationResult; +import javax.swing.*; + import static org.nuiton.i18n.I18n.t; /** @@ -105,4 +107,14 @@ model.setPaginationParameter(paginationResult.getCurrentPage()); model.setPaginationResult(paginationResult); } + + + @Override + protected void releaseAction() { + super.releaseAction(); + JFrame frame = getUI().getParentContainer(JFrame.class); + if (frame != null) { + frame.toFront(); + } + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -1,5 +1,27 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * %% + * Copyright (C) 2014 Mac-Groupe, 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.FaxToMailConfiguration; import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import jaxx.runtime.swing.AboutPanel; @@ -38,8 +60,8 @@ about = null; String name = "faxtomail"; - String licensePath = "META-INF/" + name + "-LICENSE.txt"; - String thirdPartyPath = "META-INF/" + name + "-THIRD-PARTY.txt"; +// String licensePath = "META-INF/" + name + "-LICENSE.txt"; +// String thirdPartyPath = "META-INF/" + name + "-THIRD-PARTY.txt"; about = new AboutPanel(); about.setTitle(t("faxtomail.about.title")); @@ -59,8 +81,8 @@ config.getOrganizationName(), years, config.getVersion())); - about.setLicenseFile(licensePath); - about.setThirdpartyFile(thirdPartyPath); +// about.setLicenseFile(licensePath); +// about.setThirdpartyFile(thirdPartyPath); about.buildTopPanel(); about.init(); 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 @@ -157,9 +157,11 @@ currentEmail.fromEntity(email); MailFolder folder = currentEmail.getMailFolder(); - currentEmail.setEditable(currentEmail.getArchiveDate() == null - && folder.isFolderWritable() - && currentEmail.getDemandStatus().isEditableStatus()); + if (currentEmail.getArchiveDate() != null + || !folder.isFolderWritable() + || !currentEmail.getDemandStatus().isEditableStatus()) { + currentEmail.setEditable(false); + } } super.doAction(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeListAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeListAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeListAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 @@ -22,8 +22,11 @@ * #L% */ +import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.FaxToMailScreen; import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import static org.nuiton.i18n.I18n.t; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/Common.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/Common.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/Common.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id:$ * $HeadURL:$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -23,4 +23,4 @@ */ BeanFilterableComboBox, BeanComboBox { maximumRowCount: 20; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -2,7 +2,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 @@ -83,4 +83,4 @@ #status { showClock: false; showMemoryStatus: false; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -2,7 +2,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 - 2013 Ifremer + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellRenderer.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellRenderer.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellRenderer.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -69,4 +69,4 @@ </JPanel> </JScrollPane> </JXTitledPanel> -</com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupUI> \ No newline at end of file +</com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupUI> 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -58,4 +58,4 @@ toolTipText: "faxtomail.attachmentEditor.action.remove.tip"; enabled: { handler != null && handler.isAttachmentRemovable(getAttachment()) }; visible: { isEditable() }; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -48,4 +48,4 @@ onActionPerformed='handler.removeAttachment(this)'/> </JToolBar> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id:$ * $HeadURL:$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -2,7 +2,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 @@ -153,4 +153,4 @@ #nextPageButton { text: "faxtomail.demandeList.goToNextPage"; enabled: { model.getPaginationResult().hasNextPage() }; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -2,7 +2,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 @@ -117,4 +117,4 @@ </JPanel> </JSplitPane> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 @@ -264,18 +264,7 @@ if (folderNode.isCanSelect()) { MailFolder folder = folderNode.getMailFolder(); - getContext().setCurrentMailFolder(folder); getModel().setSelectedFolder(folder); - - DemandeUIModel currentEmail = getContext().getCurrentEmail(); - if (currentEmail != null) { - AbstractApplicationTableModel<DemandeUIModel> dataTableModel = (AbstractApplicationTableModel<DemandeUIModel>) dataTable.getModel(); - int row = dataTableModel.getRowIndex(currentEmail); - if (row > 0) { - dataTable.setRowSelectionInterval(row, row); - dataTable.scrollRowToVisible(row); - } - } } } }); @@ -284,7 +273,13 @@ @Override public void propertyChange(PropertyChangeEvent evt) { MailFolder folder = (MailFolder) evt.getNewValue(); + getContext().setCurrentMailFolder(folder); loadFolderDemands(folder, nodesByFolder); + + DefaultMutableTreeNode node = nodesByFolder.get(folder); + if (node != null) { + navigationTree.setSelectionPath(new TreePath(node.getPath())); + } } }); @@ -299,19 +294,6 @@ updateResultPerPage(e); } }); - - MailFolder currentMailFolder = getContext().getCurrentMailFolder(); - DemandeUIModel currentEmail = getContext().getCurrentEmail(); - - if (currentMailFolder == null && currentEmail != null) { - currentMailFolder = currentEmail.getMailFolder(); - } - if (currentMailFolder != null) { - DefaultMutableTreeNode node = nodesByFolder.get(currentMailFolder); - if (node != null) { - navigationTree.setSelectionPath(new TreePath(node.getPath())); - } - } } public void initTableFilter() { @@ -340,28 +322,20 @@ } protected void loadFolderDemands(MailFolder folder, Map<MailFolder, FolderTreeNode> nodesByFolder) { + if (folder != null) { + FolderTreeNode folderNode = nodesByFolder.get(folder); + boolean readable = folderNode.isCanRead(); - FolderTreeNode folderNode = nodesByFolder.get(folder); - boolean readable = folderNode.isCanRead(); + while (folder.getAllowCreateDemandIntoFolder() == null + && folder.getParent() != null) { + folder = folder.getParent(); + } - while (folder.getAllowCreateDemandIntoFolder() == null - && folder.getParent() != null) { - folder = folder.getParent(); + DemandeListUIModel model = getModel(); + model.setComputeQuantitiesByRangeEnabled(readable); + model.setNewDemandEnabled(readable && folder != null && Boolean.TRUE.equals(folder.getAllowCreateDemandIntoFolder())); } - DemandeListUIModel model = getModel(); - model.setComputeQuantitiesByRangeEnabled(readable); - model.setNewDemandEnabled(readable && folder != null && Boolean.TRUE.equals(folder.getAllowCreateDemandIntoFolder())); - -// FaxToMailUIContext context = getContext(); -// LoadFolderEmailsAction loadFolderEmailsAction = -// context.getActionFactory().createLogicAction(this, LoadFolderEmailsAction.class); -// -// if (context.isActionInProgress(null)) { -// context.getActionEngine().runInternalAction(loadFolderEmailsAction); -// } else { -// context.getActionEngine().runAction(loadFolderEmailsAction); -// } tableFilter.clear(); } 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -2,7 +2,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 @@ -339,4 +339,4 @@ #rightVerticalSplitPanel { resizeWeight: 0.8; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -2,7 +2,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -68,4 +68,4 @@ text: "faxtomail.demande.group.button.label"; actionIcon: group; enabled: { model.isGroupEnabled() }; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -63,4 +63,4 @@ <JButton id="groupButton" onActionPerformed="handler.group()"/> </JPanel> -</JPanel> \ No newline at end of file +</JPanel> 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -27,4 +27,4 @@ #okButton { text: "faxtomail.quantitiesByRange.button.text"; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -50,4 +50,4 @@ <JButton id='okButton' onActionPerformed='handler.cancel()'/> </JPanel> -</JPanel> \ No newline at end of file +</JPanel> 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeRowModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/ButtonEmailGroup.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/ButtonEmailGroup.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/ButtonEmailGroup.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupCellRenderer.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupCellRenderer.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupCellRenderer.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -37,4 +37,4 @@ #openDemandeButton { actionIcon: "open"; toolTipText: "faxtomail.attachmentEditor.action.open.tip"; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -47,4 +47,4 @@ onActionPerformed='handler.openDemande(demande)'/> </JToolBar> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -43,4 +43,4 @@ </JScrollPane> </JXTitledPanel> -</com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupUI> \ No newline at end of file +</com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupUI> 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/ButtonHistory.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/ButtonHistory.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/ButtonHistory.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItem.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItem.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItem.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -60,4 +60,4 @@ #fields { text : { handler.decorateFields(model.getFields()) }; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItem.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItem.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItem.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -57,4 +57,4 @@ <JLabel id='fields'/> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItemModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItemModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItemModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -27,4 +27,4 @@ #histories { enabled: false; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -41,4 +41,4 @@ </JScrollPane> </JXTitledPanel> -</com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupUI> \ No newline at end of file +</com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupUI> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -46,4 +46,4 @@ </JScrollPane> </JXTitledPanel> -</com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupUI> \ No newline at end of file +</com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupUI> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -48,4 +48,4 @@ #openReplyButton { actionIcon: "open"; toolTipText: "faxtomail.demandReplies.action.open.tip"; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -55,4 +55,4 @@ onActionPerformed='handler.openReply(this)'/> </JToolBar> -</JPanel> \ No newline at end of file +</JPanel> 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 - 2013 Ifremer + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -36,4 +36,4 @@ background: { null }; contentAreaFilled: false; focusPainted: false; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -60,4 +60,4 @@ <JButton id="removeButton" onActionPerformed="removeCross()"/> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -35,4 +35,4 @@ background: { null }; contentAreaFilled: false; focusPainted: false; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -48,4 +48,4 @@ <JButton id="removeButton" onActionPerformed="removeCross()"/> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -35,4 +35,4 @@ background: { null }; contentAreaFilled: false; focusPainted: false; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -66,4 +66,4 @@ <JButton id="removeButton" onActionPerformed="removeLine()"/> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -53,4 +53,4 @@ font-size: { (float)(DEFAULT_FONT_SIZE * getZoom()) }; lineWrap: { false }; wrapStyleWord: { false }; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -81,4 +81,4 @@ constraints="BorderLayout.CENTER" onKeyReleased="textTyped()"/> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -125,4 +125,4 @@ text: "faxtomail.pdfEditor.action.validate"; toolTipText: "faxtomail.pdfEditor.action.validate.tip"; _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.GenerateAnnotatedAttachmentAction.class}; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -101,4 +101,4 @@ <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> <JButton id='validateButton'/> </JPanel> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -37,4 +37,4 @@ text: "faxtomail.chooseAttachmentToPrint.action.validate"; toolTipText: "faxtomail.chooseAttachmentToPrint.action.validate.tip"; enabled: { !model.getAttachmentsToPrint().isEmpty() }; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -59,4 +59,4 @@ <JButton id='validateButton' onActionPerformed="handler.print()"/> </JPanel> -</JPanel> \ No newline at end of file +</JPanel> 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -47,4 +47,4 @@ onActionPerformed='handler.removeAttachment(replyAttachmentModel)'/> </JToolBar> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -147,4 +147,4 @@ /* FIXME echatellier 20140715 : ca doit pas se faire comme ca, mais pas trop d'idée */ enabled: { getModel().isValid() && getModel().isAttachmentSizeValid(getModel().getTotalAttachmentLength()) }; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -2,18 +2,18 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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>. @@ -168,4 +168,4 @@ </JPanel> </JPanel> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -2,7 +2,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 @@ -330,4 +330,4 @@ #nextPageButton { text: "faxtomail.demandeList.goToNextPage"; enabled: { model.getPaginationResult().hasNextPage() }; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -2,7 +2,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 @@ -396,4 +396,4 @@ <JButton id='groupButton' onActionPerformed='handler.group()'/> </JPanel> -</JPanel> \ No newline at end of file +</JPanel> 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -50,6 +50,7 @@ import com.franciaflex.faxtomail.persistence.entities.HasLabel; import com.franciaflex.faxtomail.persistence.entities.SearchFilter; +import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; @@ -71,6 +72,7 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; import com.franciaflex.faxtomail.ui.swing.util.PaginationComboModel; +import org.nuiton.util.pagination.PaginationParameter; /** * @author Kevin Morin (Code Lutin) @@ -188,10 +190,6 @@ } }); - if (getContext().getSearch() != null) { - runSearchAction(); - } - dataTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() { @Override public void valueChanged(ListSelectionEvent e) { @@ -298,15 +296,26 @@ } protected void runSearchAction() { + FaxToMailUIContext context = getContext(); + PaginationParameter currentPaginationParameter = context.getCurrentPaginationParameter(); + if (currentPaginationParameter != null) { + getModel().setPaginationParameter(currentPaginationParameter); + context.setCurrentPaginationParameter(null); + } + try { SearchToGroupAction searchAction = new SearchToGroupAction(this); - getContext().getActionEngine().runAction(searchAction); + if (context.isActionInProgress(null)) { + context.getActionEngine().runFullInternalAction(searchAction); + } else { + context.getActionEngine().runAction(searchAction); + } } catch (Exception e) { if (log.isErrorEnabled()) { log.error("error while searching", e); } - getContext().getErrorHelper().showErrorDialog(t("faxtomail.search.action.error")); + context.getErrorHelper().showErrorDialog(t("faxtomail.search.action.error")); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -2,7 +2,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 @@ -329,4 +329,4 @@ #nextPageButton { text: "faxtomail.demandeList.goToNextPage"; enabled: { model.getPaginationResult().hasNextPage() }; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -2,7 +2,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 @@ -410,4 +410,4 @@ </JSplitPane> -</JPanel> \ No newline at end of file +</JPanel> 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -44,4 +44,4 @@ toolTipText: "faxtomail.chooseMailFolder.action.validate.tip"; _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.TransmitAction.class}; enabled: { model.getMailFolder() != null }; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -51,4 +51,4 @@ <JButton id='validateButton'/> </JPanel> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailBeanUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailBeanUIModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailBeanUIModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupButton.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -113,4 +113,4 @@ public void onCloseUI() { setSelected(false); } -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupHandler.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -147,4 +147,4 @@ ui.setLocation(x, y); } -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupUI.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupUI.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -24,4 +24,4 @@ #dialog { undecorated: true; //alwaysOnTop: true; -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupUI.jaxx 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupUI.jaxx 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -53,4 +53,4 @@ <JXTitledPanel id='body' constraints='BorderLayout.CENTER'> </JXTitledPanel> -</JDialog> \ No newline at end of file +</JDialog> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -78,4 +78,4 @@ public HL getElementAt(int index) { return Iterables.get(values, index); } -} \ No newline at end of file +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailExceptionHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailExceptionHandler.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailExceptionHandler.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUI.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/PaginationComboModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/PaginationComboModel.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/PaginationComboModel.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/RemoveablePropertyChangeListener.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/RemoveablePropertyChangeListener.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/RemoveablePropertyChangeListener.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/UIMessageNotifier.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/UIMessageNotifier.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/UIMessageNotifier.java 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * #%L * FaxToMail :: UI * %% - * Copyright (C) 2014 Franciaflex + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-10-02 11:30:33 UTC (rev 660) @@ -5,7 +5,7 @@ application.action.create.error= application.error.ui.business.warning= faxtomail.about.bottomText=Copyright %s - %s - version %s -faxtomail.about.message=<h3>FaxToMail</h3><p><strong>Outil de gestion d'emails.</strong></p><br/><p>Ce logiciel permet de router les emails reçus vers des dossiers et de les transformer en formulaires. Ils peuvent être déplacés entre dossiers pour êtres remplis par différentes personnes puis archivés.</p><p>Ce projet a été initiée en 2014 par le groupe MAC et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.</p><hr/><br/><p>Pour plus d'informations, vous pouvez visiter le <a href\="http\://doc.codelutin.com/faxtomail">site du projet</a>.</p><p>Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/faxtomail">Forge.codelutin.com</a>.</p> +faxtomail.about.message=<h3>FaxToMail</h3><p><strong>Outil de gestion d'emails.</strong></p><br/><p>Ce logiciel permet de router les emails reçus vers des dossiers et de les transformer en formulaires. Ils peuvent être déplacés entre dossiers pour êtres remplis par différentes personnes puis archivés.</p><p>Ce projet a été initiée en 2014 par le groupe MAC et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.</p><hr/><br/><p>Pour plus d'informations, vous pouvez visiter le <a href\="http\://doc.codelutin.com/faxtomail">site du projet</a>.</p><p>Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/faxtomail">forge.codelutin.com</a>.</p> faxtomail.about.title=À propos de FaxToMail faxtomail.action.archive.tip=Archiver l'élément faxtomail.action.attachment.edit.tip=Edition du fichier %s @@ -37,7 +37,7 @@ faxtomail.alert.archiveConfirmation.title=Confirmation de l'archivage faxtomail.alert.archivesConfirmation.message=<html>Êtes vous sûr de vouloir archiver ces éléments ?<br/>L'archivage est définitif.</html> faxtomail.alert.archivesWithNotArchivableConfirmation.message=<html>Les éléments suivants ne peuvent pas être archivés car ils ne sont pas valides \:<br/>%sÊtes vous sûr de vouloir archiver les autres éléments ?<br/>L'archivage est définitif.</html> -faxtomail.alert.demandsNotTransmittable.message=<html>Les éléments suivant ne seront pas déplacés car ils ne sont pas valides \:<br/>%s</html> +faxtomail.alert.demandsNotTransmittable.message=<html>Les éléments suivant ne seront pas déplacés \:<br/>%s</html> faxtomail.alert.demandsNotTransmittable.title=Éléments non déplaçables faxtomail.alert.emailMoved.message=<html>Depuis que vous avez chargé les éléments du dossier %1$s, l'élément<br/>%3$s<br/>a été déplacé dans le dossier %2$s.</html> faxtomail.alert.emailMoved.title=Élément déplacé @@ -45,7 +45,7 @@ faxtomail.alert.groupConfirmation.title=Confirmation du groupement faxtomail.alert.noDemandToArchive.message=<html>Les éléments suivants ne peuvent pas être archivés car ils ne sont pas valides \:<br/>%sIl n'y a pas d'autres éléments à archiver.</html> faxtomail.alert.noDemandToArchive.title=Aucun élément à archiver -faxtomail.alert.noDemandToTransmit.message=<html>Les éléments suivants ne seront pas déplacés car ils ne sont pas valides \:<br/>%sIl n'y a pas d'autres éléments à déplacer.</html> +faxtomail.alert.noDemandToTransmit.message=<html>Les éléments suivants ne seront pas déplacés \:<br/>%sIl n'y a pas d'autres éléments à déplacer.</html> faxtomail.alert.noDemandToTransmit.title=Aucun élément à déplacer faxtomail.alert.transmit.groupedDemandsInSameFolder.message=<html>L'élément %1$s a un ou plusieurs éléments groupés dans le même dossier \:<br/>%2$sVoulez-vous les déplacer aussi ?</html> faxtomail.alert.transmit.groupedDemandsInSameFolder.title=Déplacer les éléments groupés Modified: trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -5,7 +5,7 @@ $Id: log4j2.xml 532 2014-08-12 16:39:47Z echatellier $ $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-ui-swing/src/main/resou… $ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -52,4 +52,4 @@ <AppenderRef ref="File" /> </Root> </Loggers> -</Configuration> \ No newline at end of file +</Configuration> Deleted: trunk/faxtomail-ui-swing/src/main/resources/splashscreen.jpg =================================================================== (Binary files differ) Added: trunk/faxtomail-ui-swing/src/main/resources/splashscreen.png =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-ui-swing/src/main/resources/splashscreen.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/pom.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -3,7 +3,7 @@ #%L FaxToMail :: Web %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties 2014-10-02 11:30:33 UTC (rev 660) @@ -1,3 +1,24 @@ +### +# #%L +# FaxToMail :: Web +# %% +# Copyright (C) 2014 Mac-Groupe, 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% +### # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailLoginInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailLoginInterceptor.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailLoginInterceptor.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/IndexAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/IndexAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/IndexAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationJsonAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationJsonAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationJsonAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/AbstractFaxToMailJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/AbstractFaxToMailJob.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/AbstractFaxToMailJob.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/HibernateProxyTypeAdapter.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/HibernateProxyTypeAdapter.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/HibernateProxyTypeAdapter.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/TopiaEntityAdapter.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/TopiaEntityAdapter.java 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/TopiaEntityAdapter.java 2014-10-02 11:30:33 UTC (rev 660) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/resources/log4j2.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/log4j2.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/resources/log4j2.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -56,4 +56,4 @@  </Root> </Loggers> -</Configuration> \ No newline at end of file +</Configuration> Modified: trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2014 Franciaflex, Code Lutin +# Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/resources/quartz.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/quartz.properties 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/resources/quartz.properties 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2014 Franciaflex, Code Lutin +# Copyright (C) 2014 Mac-Groupe, 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 @@ -25,4 +25,4 @@ org.quartz.threadPool.threadCount = 10 -org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore \ No newline at end of file +org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore Modified: trunk/faxtomail-ui-web/src/main/resources/struts.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/struts.properties 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/resources/struts.properties 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2014 Franciaflex, Code Lutin +# Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/resources/struts.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/struts.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/resources/struts.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/resources/validators.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/validators.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/resources/validators.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/resources/xwork-conversion.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/xwork-conversion.properties 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/resources/xwork-conversion.properties 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2014 Franciaflex, Code Lutin +# Copyright (C) 2014 Mac-Groupe, 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 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-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-archive-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-archive-input.jsp 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-archive-input.jsp 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-wait.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-wait.jsp 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-wait.jsp 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.jsp 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.jsp 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/login-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/login-input.jsp 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/login-input.jsp 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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 @@ -91,4 +91,4 @@ <group name='faxtomail-lock'> <css>/css/faxtomail.css</css> </group> -</groups> \ No newline at end of file +</groups> Modified: trunk/faxtomail-ui-web/src/main/webapp/css/faxtomail.css =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/css/faxtomail.css 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/css/faxtomail.css 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -91,4 +91,4 @@ /*.chosen-container { width:100%; -}*/ \ No newline at end of file +}*/ Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 @@ -91,4 +91,4 @@ }); } }; -}); \ No newline at end of file +}); Modified: trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Franciaflex, Code Lutin + * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/pom.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -3,7 +3,7 @@ #%L FaxToMail %% - Copyright (C) 2014 Franciaflex + Copyright (C) 2014 Mac-Groupe, 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 @@ -126,7 +126,7 @@ <i18n.silent>true</i18n.silent>  - <license.organizationName>Franciaflex, Code Lutin</license.organizationName> + <license.organizationName>Mac-Groupe, Code Lutin</license.organizationName> <license.licenseName>gpl_v3</license.licenseName>  Modified: trunk/src/site/rst/import.rst =================================================================== --- trunk/src/site/rst/import.rst 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/src/site/rst/import.rst 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2014 Franciaflex, Code Lutin +.. * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/src/site/rst/index.rst 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2014 Franciaflex, Code Lutin +.. * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/src/site/rst/install.rst 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2014 Franciaflex, Code Lutin +.. * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/src/site/rst/mssql.rst =================================================================== --- trunk/src/site/rst/mssql.rst 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/src/site/rst/mssql.rst 2014-10-02 11:30:33 UTC (rev 660) @@ -4,7 +4,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2014 Franciaflex, Code Lutin +.. * Copyright (C) 2014 Mac-Groupe, 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 Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-10-01 15:58:42 UTC (rev 659) +++ trunk/src/site/site_fr.xml 2014-10-02 11:30:33 UTC (rev 660) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2014 Franciaflex, Code Lutin + Copyright (C) 2014 Mac-Groupe, 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

1 0

r659 - in trunk: 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/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin＠users.forge.codelutin.com 01 Oct '14

01 Oct '14

Author: kmorin Date: 2014-10-01 17:58:42 +0200 (Wed, 01 Oct 2014) New Revision: 659 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/659 Log: - am?\195?\169lioration de la gestion de l'?\195?\169ditabilit?\195?\169 des ?\195?\169l?\195?\169ments - ne pas d?\195?\169placer un ?\195?\169l?\195?\169ment archiv?\195?\169 group?\195?\169 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/DemandStatus.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.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/actions/TransmitAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/DemandStatus.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/DemandStatus.java 2014-10-01 13:38:51 UTC (rev 658) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/DemandStatus.java 2014-10-01 15:58:42 UTC (rev 659) @@ -32,17 +32,20 @@ */ public enum DemandStatus implements HasLabel { - UNTREATED(n("faxtomail.demandStatus.untreated")), - IN_PROGRESS(n("faxtomail.demandStatus.inProgress")), - TRANSMISSION_TO_EDI(n("faxtomail.demandStatus.transmissionToEdi")), - TRANSMITTED_TO_EDI(n("faxtomail.demandStatus.transmittedToEdi")), - QUALIFIED(n("faxtomail.demandStatus.qualified")), - ARCHIVED(n("faxtomail.demandStatus.archive")); + UNTREATED(n("faxtomail.demandStatus.untreated"), true), + IN_PROGRESS(n("faxtomail.demandStatus.inProgress"), true), + TRANSMISSION_TO_EDI(n("faxtomail.demandStatus.transmissionToEdi"), false), + TRANSMITTED_TO_EDI(n("faxtomail.demandStatus.transmittedToEdi"), false), + QUALIFIED(n("faxtomail.demandStatus.qualified"), true), + ARCHIVED(n("faxtomail.demandStatus.archive"), false); protected String labelKey; - private DemandStatus(String labelKey) { + protected boolean editableStatus; + + private DemandStatus(String labelKey, boolean editable) { this.labelKey = labelKey; + this.editableStatus = editable; } public String getLabelKey() { @@ -52,4 +55,8 @@ public String getLabel() { return t(labelKey); } + + public boolean isEditableStatus() { + return editableStatus; + } } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-10-01 13:38:51 UTC (rev 658) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-10-01 15:58:42 UTC (rev 659) @@ -147,10 +147,7 @@ if (folder.isChildrenNotEmpty()) { for (MailFolder child : folder.getChildren()) { - // if the child is in the readable roots, remove it to merge the branches - if (!readableRoots.remove(child)) { - browseReadableFolders(child, readableRoots, user, writable); - } + browseReadableFolders(child, readableRoots, user, writable); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-10-01 13:38:51 UTC (rev 658) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-10-01 15:58:42 UTC (rev 659) @@ -153,9 +153,9 @@ demandToOpen.fromEntity(email); MailFolder folder = demandToOpen.getMailFolder(); - if (demandToOpen.getArchiveDate() != null || !folder.isFolderWritable()) { - demandToOpen.setEditable(false); - } + demandToOpen.setEditable(demandToOpen.getArchiveDate() == null + && folder.isFolderWritable() + && demandToOpen.getDemandStatus().isEditableStatus()); demandToOpen.setCloseable(true); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java 2014-10-01 13:38:51 UTC (rev 658) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java 2014-10-01 15:58:42 UTC (rev 659) @@ -31,6 +31,7 @@ import java.util.List; import java.util.Map; +import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.beans.BeanMonitor; @@ -114,7 +115,7 @@ } FaxToMailUser currentUser = context.getCurrentUser(); - if (takeIfNotTaken && model.getTakenBy() == null) { + if (model.getDemandStatus() != DemandStatus.ARCHIVED && takeIfNotTaken && model.getTakenBy() == null) { model.setTakenBy(getContext().getCurrentUser()); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java 2014-10-01 13:38:51 UTC (rev 658) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java 2014-10-01 15:58:42 UTC (rev 659) @@ -77,7 +77,7 @@ for (Email email : emails) { DemandeUIModel demand = new DemandeUIModel(); - demand.fromEntityExcluding(email, Sets.newHashSet(Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_HISTORY)); + demand.fromEntityExcluding(email, Sets.newHashSet(Email.PROPERTY_HISTORY)); // on ajoute toutes les lignes de rangeRow, // qui sont toutes valides puisqu'on les récupère de la base et qu'on ne sauvegarde que les lignes valides @@ -94,10 +94,7 @@ } } - MailFolder mailFolder = email.getMailFolder(); demand.setValid(handler.isDemandeValid(demand)); - demand.setMailFolder(mailFolder); - demand.setEditable(mailFolder.isFolderWritable()); WaitingState waitingState = email.getWaitingState(); if (waitingState != null) { demand.setWaitingState(waitingStateById.get(waitingState.getTopiaId())); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-10-01 13:38:51 UTC (rev 658) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-10-01 15:58:42 UTC (rev 659) @@ -76,7 +76,7 @@ for (Email email : emails) { DemandeUIModel demand = new DemandeUIModel(); - demand.fromEntityExcluding(email, Sets.newHashSet(Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_HISTORY)); + demand.fromEntityExcluding(email, Sets.newHashSet(Email.PROPERTY_HISTORY)); // on ajoute toutes les lignes de rangeRow, // qui sont toutes valides puisqu'on les récupère de la base et qu'on ne sauvegarde que les lignes valides @@ -95,8 +95,6 @@ MailFolder mailFolder = email.getMailFolder(); demand.setValid(handler.isDemandeValid(demand)); - demand.setMailFolder(mailFolder); - demand.setEditable(mailFolder.isFolderWritable()); WaitingState waitingState = email.getWaitingState(); if (waitingState != null) { demand.setWaitingState(waitingStateById.get(waitingState.getTopiaId())); 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-10-01 13:38:51 UTC (rev 658) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-10-01 15:58:42 UTC (rev 659) @@ -157,9 +157,9 @@ currentEmail.fromEntity(email); MailFolder folder = currentEmail.getMailFolder(); - if (currentEmail.getArchiveDate() != null || !folder.isFolderWritable()) { - currentEmail.setEditable(false); - } + currentEmail.setEditable(currentEmail.getArchiveDate() == null + && folder.isFolderWritable() + && currentEmail.getDemandStatus().isEditableStatus()); } super.doAction(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java 2014-10-01 13:38:51 UTC (rev 658) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java 2014-10-01 15:58:42 UTC (rev 659) @@ -26,6 +26,7 @@ import static org.nuiton.i18n.I18n.t; +import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; @@ -75,6 +76,7 @@ @Override public boolean apply(DemandeUIModel groupDemandeUIModel) { return !demandeUIModel.equals(groupDemandeUIModel) + && groupDemandeUIModel.getDemandStatus().isEditableStatus() && mailFolder.equals(groupDemandeUIModel.getMailFolder()); } }); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-10-01 13:38:51 UTC (rev 658) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-10-01 15:58:42 UTC (rev 659) @@ -435,7 +435,13 @@ @Override protected MailField[] getEditableTableProperties() { - return new MailField[] { MailField.PRIORITY, MailField.ATTACHMENT, MailField.REPLIES }; + MailField[] result; + if (getModel().getSelectedFolder() != null && getModel().getSelectedFolder().isFolderWritable()) { + result = new MailField[] { MailField.PRIORITY, MailField.ATTACHMENT, MailField.REPLIES }; + } else { + result = new MailField[] { MailField.ATTACHMENT, MailField.REPLIES }; + } + return result; } @Override Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-10-01 13:38:51 UTC (rev 658) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-10-01 15:58:42 UTC (rev 659) @@ -31,13 +31,11 @@ } JTextField, JXTable, BeanFilterableComboBox, #commentField, ButtonAttachment, ButtonDemandReplies { - editable: { model.isEditable() && - !DemandStatus.TRANSMITTED_TO_EDI.equals(model.getDemandStatus()) }; + editable: { model.isEditable() }; } BeanFilterableComboBox { - enabled: { model.isEditable() && - !DemandStatus.TRANSMITTED_TO_EDI.equals(model.getDemandStatus()) }; + enabled: { model.isEditable() }; } .rightLabel { 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-10-01 13:38:51 UTC (rev 658) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-10-01 15:58:42 UTC (rev 659) @@ -194,7 +194,7 @@ */ @Override public void fromEntity(Email entity) { - fromBeanBinder.copyExcluding(entity, this, Email.PROPERTY_ATTACHMENT, Email.PROPERTY_REPLIES); + fromBeanBinder.copyExcluding(entity, this, Email.PROPERTY_ATTACHMENT, Email.PROPERTY_REPLIES, Email.PROPERTY_EMAIL_GROUP); loadAttachments(entity); setGroupedDemandes(entity.getEmailGroup()); loadReplies(entity); @@ -724,6 +724,7 @@ demandeUIModel.setCompanyReference(email.getCompanyReference()); demandeUIModel.setTopiaId(email.getTopiaId()); demandeUIModel.setMailFolder(email.getMailFolder()); + demandeUIModel.setDemandStatus(email.getDemandStatus()); groupedDemandes.add(demandeUIModel); } }

1 0

r658 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by kmorin＠users.forge.codelutin.com 01 Oct '14

01 Oct '14

Author: kmorin Date: 2014-10-01 15:38:51 +0200 (Wed, 01 Oct 2014) New Revision: 658 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/658 Log: concat?\195?\169nation des erreurs edi Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-10-01 13:36:24 UTC (rev 657) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-10-01 13:38:51 UTC (rev 658) @@ -1269,7 +1269,12 @@ if (StringUtils.isNotBlank(error)) { //error + String oldError = email.getEdiError(); + if (StringUtils.isNotBlank(oldError)) { + error = oldError + ", " + error; + } email.setEdiError(error); + } else { rangeRow.setCommandNumber(commandNumber); rangeRowTopiaDao.update(rangeRow);

1 0

r657 - in trunk: . faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing faxtomail-ui-swing/src/license faxtomail-ui-swing/src/main faxtomail-ui-swing/src/main/filtered-resources 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/main/resources faxtomail-ui-sw
by kmorin＠users.forge.codelutin.com 01 Oct '14

01 Oct '14

Author: kmorin Date: 2014-10-01 15:36:24 +0200 (Wed, 01 Oct 2014) New Revision: 657 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/657 Log: - ajout du splash screen - ajout du a propos - correction de la g?\195?\169n?\195?\169ration du fichier edi Added: trunk/faxtomail-ui-swing/src/main/filtered-resources/ trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java trunk/faxtomail-ui-swing/src/main/resources/PoetsenOne-Regular.ttf trunk/faxtomail-ui-swing/src/main/resources/icons/action-about.png trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml trunk/faxtomail-ui-swing/src/main/resources/splashscreen.jpg Removed: trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties trunk/pom.xml Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-10-01 13:36:24 UTC (rev 657) @@ -460,6 +460,7 @@ // changement du status email.setDemandStatus(DemandStatus.TRANSMISSION_TO_EDI); fieldSet.add(Email.PROPERTY_DEMAND_STATUS); + } else { // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, @@ -553,8 +554,8 @@ ediWriter.write("OARFAX" + separator); //03/Date traitement/Date/6/JJMMAA dte système ediWriter.write(DateFormatUtils.format(now, "ddMMyy") + separator); - //04/Date livraison prévue/Date/6/JJMMAA dte système - ediWriter.write(DateFormatUtils.format(now, "ddMMyy") + separator); + //04/Date livraison prévue/Date/6/JJMMAA dte de réception + ediWriter.write(DateFormatUtils.format(email.getReceptionDate(), "ddMMyy") + separator); //05/Commentaire/Alpha/70/Vide ediWriter.write(separator); //06/Commentaire/Alpha/70/Vide @@ -598,7 +599,7 @@ //26/Code Ean fournisseur/Alpha/13/Gamme ediWriter.write(rangeRow.getRange().getLabel() + separator); //27/Identifiant Unique - ediWriter.write(rangeRow.getRange().getTopiaId() + "\n"); + ediWriter.write(rangeRow.getTopiaId() + "\n"); ediWriter.write("%END_ENTETE_QUOTE\n"); Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/pom.xml 2014-10-01 13:36:24 UTC (rev 657) @@ -158,6 +158,11 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-extra</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> </dependency> @@ -261,22 +266,21 @@ <build> <resources> <resource> - <directory>src/main/resources</directory> + <directory>src/main/filtered-resources</directory> + <filtering>true</filtering> <includes> <include>*.config</include> <include>*.properties</include> </includes> - <filtering>true</filtering> </resource> <resource> <directory>src/main/resources</directory> - <excludes> - <exclude>*.config</exclude> - <exclude>*.properties</exclude> - </excludes> - <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> </resource> </resources> + <plugins> <plugin> Modified: trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties 2014-10-01 13:36:24 UTC (rev 657) @@ -1,36 +1,48 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 # - Apache License # - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License +# - CDDL # - Common Development and Distribution License # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License, Version 1.0 # - GNU Affero General Public License v3 +# - GNU GENERAL PUBLIC LICENSE version 2 or higher # - GNU General Public License - Version 2 with the class path exception +# - GNU General Public License version 2 (GPLv2) # - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License (LGPL), version 2.1 +# - GNU Lesser General Public License version 2.1 (LGPLv2.1) # - GNU Lesser General Public License, Version 2.1 -# - GNU Lesser General Public License, version 2.1 # - GNU Library or Lesser General Public License +# - GPLv2+CE # - General Public License (GPL) +# - LGPL # - LGPL 2.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - MPL 1.1 +# - Modified BSD License # - New BSD License +# - Public Domain # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - license.txt +# - UnboundID LDAP SDK Free Use License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Mar 24 15:58:44 CET 2014 +#Wed Oct 01 15:25:35 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -#to check javax.media.jai--com.springsource.javax.media.jai.codec--1.1.3=Apache License javax.media.jai--com.springsource.javax.media.jai.core--1.1.3=Apache License +org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl=Lesser General Public License (LGPL) v 3.0 Copied: trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties (from rev 656, trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config) =================================================================== --- trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties (rev 0) +++ trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties 2014-10-01 13:36:24 UTC (rev 657) @@ -0,0 +1,4 @@ +faxtomail.version=${project.version} +faxtomail.site.url=${project.url} +faxtomail.inceptionYear=${project.inceptionYear} +faxtomail.organizationName=${license.organizationName} \ No newline at end of file Property changes on: trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java 2014-10-01 13:36:24 UTC (rev 657) @@ -31,12 +31,16 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.widgets.extra.SplashScreen; import javax.swing.*; import javax.swing.plaf.BorderUIResource; +import javax.swing.plaf.FontUIResource; import java.awt.*; +import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.util.Arrays; /** @@ -62,44 +66,71 @@ FaxToMailConfiguration config = new FaxToMailConfiguration("faxToMail.properties", args); - // Create application context - FaxToMailUIContext context = FaxToMailUIContext.newContext(config); + Font font; + try { + InputStream fontStream = RunFaxToMail.class.getResourceAsStream("/PoetsenOne-Regular.ttf"); + font = FontUIResource.createFont(Font.TRUETYPE_FONT, fontStream).deriveFont(30f); - // override default exception management (after config init) - Thread.setDefaultUncaughtExceptionHandler(new FaxToMailExceptionHandler(context.getErrorHelper())); - // See http://forge.codelutin.com/issues/2055 - //System.setProperty("sun.awt.exception.handler", TuttiExceptionHandler.class.getName()); - - // prepare context (mainly init configs, i18n) - context.init(); - - // Prepare ui look&feel and load ui properties - try { - SwingUtil.initNimbusLoookAndFeel(); } catch (Exception e) { - // could not find nimbus look-and-feel - if (log.isWarnEnabled()) { - log.warn("Failed to init nimbus look and feel", e); + if (log.isErrorEnabled()) { + log.error("error while loading font, use the default one", e); } + font = new Font("Verdana", Font.BOLD, 20); } + SplashScreen.Title title = new SplashScreen.Title("FaxToMail " + config.getVersion(), + font, + new Point(20, 40), + new Color(200, 20, 40)); + final SplashScreen splashScreen = new SplashScreen("/splashscreen.jpg", title); + splashScreen.setRemanence(500); - boolean reload = false; + try { + // Create application context + FaxToMailUIContext context = FaxToMailUIContext.newContext(config); - if (config.isFullLaunchMode()) { + // override default exception management (after config init) + Thread.setDefaultUncaughtExceptionHandler(new FaxToMailExceptionHandler(context.getErrorHelper())); + // See http://forge.codelutin.com/issues/2055 + //System.setProperty("sun.awt.exception.handler", TuttiExceptionHandler.class.getName()); - if (log.isInfoEnabled()) { - log.info("Full launch mode, try to update."); + // prepare context (mainly init configs, i18n) + context.init(); + + // Prepare ui look&feel and load ui properties + try { + SwingUtil.initNimbusLoookAndFeel(); + } catch (Exception e) { + // could not find nimbus look-and-feel + if (log.isWarnEnabled()) { + log.warn("Failed to init nimbus look and feel", e); + } } - } + boolean reload = false; - if (!reload) { - if (log.isInfoEnabled()) { - log.info("Will start FaxToMail..."); + if (config.isFullLaunchMode()) { + + if (log.isInfoEnabled()) { + log.info("Full launch mode, try to update."); + } + } - startFaxToMail(context, true); + + if (!reload) { + if (log.isInfoEnabled()) { + log.info("Will start FaxToMail..."); + } + startFaxToMail(context, true); + } + + } finally { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + splashScreen.complete(); + } + }); } - } public static void startFaxToMail(FaxToMailUIContext context, boolean openContext) { Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java (rev 0) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java 2014-10-01 13:36:24 UTC (rev 657) @@ -0,0 +1,69 @@ +package com.franciaflex.faxtomail.ui.swing.actions; + +import com.franciaflex.faxtomail.FaxToMailConfiguration; +import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; +import jaxx.runtime.swing.AboutPanel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import java.util.Calendar; + +import static org.nuiton.i18n.I18n.t; + +/** + * To show about panel. + * + * @author Kevin Morin + */ +public class ShowAboutAction extends AbstractMainUIFaxToMailAction { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ShowAboutAction.class); + + protected AboutPanel about; + + public ShowAboutAction(MainUIHandler handler) { + super(handler, false); + } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + + about.showInDialog(getUI(), true); + } + + @Override + public void doAction() throws Exception { + + about = null; + + String name = "faxtomail"; + String licensePath = "META-INF/" + name + "-LICENSE.txt"; + String thirdPartyPath = "META-INF/" + name + "-THIRD-PARTY.txt"; + + about = new AboutPanel(); + about.setTitle(t("faxtomail.about.title")); + about.setAboutText(t("faxtomail.about.message")); + + FaxToMailConfiguration config = getConfig(); + int currentYear = Calendar.getInstance().get(Calendar.YEAR); + int inceptionYear = config.getInceptionYear(); + String years; + if (currentYear != inceptionYear) { + years = inceptionYear + "-" + currentYear; + } else { + years = inceptionYear + ""; + } + + about.setBottomText(t("faxtomail.about.bottomText", + config.getOrganizationName(), + years, + config.getVersion())); + about.setLicenseFile(licensePath); + about.setThirdpartyFile(thirdPartyPath); + about.buildTopPanel(); + + about.init(); + } + +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-10-01 13:36:24 UTC (rev 657) @@ -64,6 +64,12 @@ _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.CloseApplicationAction.class}; } +#aboutButton { + actionIcon: about; + toolTipText: "faxtomail.main.action.about.tip"; + _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.ShowAboutAction.class}; +} + #bottomBar { floatable: false; margin: {new java.awt.Insets(0, 0, 0, 5)}; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-10-01 13:36:24 UTC (rev 657) @@ -57,6 +57,7 @@ <JToolBar id='bottomBar'> <SwingValidatorMessageWidget id='validatorMessageWidget'/> + <JButton id='aboutButton'/> </JToolBar> <JXTitledPanel id='body' constraints='BorderLayout.CENTER' decorator='boxed'/> Added: trunk/faxtomail-ui-swing/src/main/resources/PoetsenOne-Regular.ttf =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-ui-swing/src/main/resources/PoetsenOne-Regular.ttf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config 2014-10-01 13:36:24 UTC (rev 657) @@ -1,4 +0,0 @@ -faxtomail.version=${project.version} -faxtomail.site.url=${project.url} -faxtomail.inceptionYear=${project.inceptionYear} -faxtomail.organizationName=${license.organizationName} \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-10-01 13:36:24 UTC (rev 657) @@ -4,6 +4,9 @@ \:= application.action.create.error= application.error.ui.business.warning= +faxtomail.about.bottomText=Copyright %s - %s - version %s +faxtomail.about.message=<h3>FaxToMail</h3><p><strong>Outil de gestion d'emails.</strong></p><br/><p>Ce logiciel permet de router les emails reçus vers des dossiers et de les transformer en formulaires. Ils peuvent être déplacés entre dossiers pour êtres remplis par différentes personnes puis archivés.</p><p>Ce projet a été initiée en 2014 par le groupe MAC et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.</p><hr/><br/><p>Pour plus d'informations, vous pouvez visiter le <a href\="http\://doc.codelutin.com/faxtomail">site du projet</a>.</p><p>Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/faxtomail">Forge.codelutin.com</a>.</p> +faxtomail.about.title=À propos de FaxToMail faxtomail.action.archive.tip=Archiver l'élément faxtomail.action.attachment.edit.tip=Edition du fichier %s faxtomail.action.attachment.open.tip=Ouverture du fichier %s @@ -216,6 +219,8 @@ faxtomail.historyList.action.tip=Historique faxtomail.historyList.text=Historique (%s) faxtomail.historyList.title=Historique +faxtomail.main.action.about=À propos +faxtomail.main.action.about.tip=À propos faxtomail.main.action.demandeList=Gestion des fax faxtomail.main.action.demandeList.tip=Gestion des fax faxtomail.main.action.exit=Quitter Added: trunk/faxtomail-ui-swing/src/main/resources/icons/action-about.png =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-about.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml 2014-10-01 13:36:24 UTC (rev 657) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<Configuration> - - <Appenders> - <Console name="Console" target="SYSTEM_OUT"> - <PatternLayout pattern="%d{yyyy/MM/dd HH:mm:ss} %5p (%c:%L) - %m%n" /> - </Console> - - <RollingFile name="File" fileName="${sys:user.home}/.faxtomail/faxtomail.log" - filePattern="${sys:user.home}/.faxtomail/faxtomail-%d{yyyyMMdd}-%i.log"> - <PatternLayout> - <pattern>%d{yyyy/MM/dd HH:mm:ss} %5p (%c:%L) - %m%n</pattern> - </PatternLayout> - <Policies> - <TimeBasedTriggeringPolicy /> - <SizeBasedTriggeringPolicy size="10 MB"/> - </Policies> - <DefaultRolloverStrategy max="5"/> - </RollingFile> - </Appenders> - - <Loggers> - <Logger name="com.franciaflex.faxtomail" level="info"/> -  - - <Root level="error"> - <AppenderRef ref="Console" /> - <AppenderRef ref="File" /> - </Root> - </Loggers> -</Configuration> \ No newline at end of file Added: trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml (rev 0) +++ trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml 2014-10-01 13:36:24 UTC (rev 657) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<Configuration> + + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{yyyy/MM/dd HH:mm:ss} %5p (%c:%L) - %m%n" /> + </Console> + + <RollingFile name="File" fileName="${sys:user.home}/.faxtomail/faxtomail.log" + filePattern="${sys:user.home}/.faxtomail/faxtomail-%d{yyyyMMdd}-%i.log"> + <PatternLayout> + <pattern>%d{yyyy/MM/dd HH:mm:ss} %5p (%c:%L) - %m%n</pattern> + </PatternLayout> + <Policies> + <TimeBasedTriggeringPolicy /> + <SizeBasedTriggeringPolicy size="10 MB"/> + </Policies> + <DefaultRolloverStrategy max="5"/> + </RollingFile> + </Appenders> + + <Loggers> + <Logger name="com.franciaflex.faxtomail" level="info"/> +  + + <Root level="error"> + <AppenderRef ref="Console" /> + <AppenderRef ref="File" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file Added: trunk/faxtomail-ui-swing/src/main/resources/splashscreen.jpg =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-ui-swing/src/main/resources/splashscreen.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/pom.xml 2014-10-01 13:36:24 UTC (rev 657) @@ -331,6 +331,12 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-extra</artifactId> + <version>${jaxxVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-application-api</artifactId> <version>${jaxxVersion}</version> </dependency>

1 0