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

r634 - trunk/faxtomail-ui-web/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 19 Sep '14

19 Sep '14

Author: echatellier Date: 2014-09-19 15:11:03 +0200 (Fri, 19 Sep 2014) New Revision: 634 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/634 Log: Fix waiting state enum Modified: trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties Modified: trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-09-19 07:44:44 UTC (rev 633) +++ trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-09-19 13:11:03 UTC (rev 634) @@ -16,7 +16,7 @@ com.franciaflex.faxtomail.persistence.entities.MailField.DEMAND_STATUS=Statut de demande com.franciaflex.faxtomail.persistence.entities.MailField.DEMAND_TYPE=Type de demande com.franciaflex.faxtomail.persistence.entities.MailField.EDI_RETURN=Retour EDI -com.franciaflex.faxtomail.persistence.entities.MailField.ETAT_ATTENTE=État d'attente +com.franciaflex.faxtomail.persistence.entities.MailField.WAITING_STATE=État d'attente com.franciaflex.faxtomail.persistence.entities.MailField.FAX=Fax com.franciaflex.faxtomail.persistence.entities.MailField.LAST_ATTACHMENT_OPENING_IN_THIS_FOLDER_USER=Dernier à ouvrir une PJ com.franciaflex.faxtomail.persistence.entities.MailField.MAIL_FOLDER=Dossier

1 0

r633 - in trunk: . faxtomail-ui-swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by echatellier＠users.forge.codelutin.com 19 Sep '14

19 Sep '14

Author: echatellier Date: 2014-09-19 09:44:44 +0200 (Fri, 19 Sep 2014) New Revision: 633 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/633 Log: Fix build Modified: trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java trunk/pom.xml Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-09-18 14:39:45 UTC (rev 632) +++ trunk/faxtomail-ui-swing/pom.xml 2014-09-19 07:44:44 UTC (rev 633) @@ -182,11 +182,6 @@ <artifactId>swingx-common</artifactId> </dependency> - <dependency> - <groupId>com.ezware.oxbow</groupId> - <artifactId>swing-bits</artifactId> - </dependency> -  <dependency> <groupId>org.apache.logging.log4j</groupId> 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-09-18 14:39:45 UTC (rev 632) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-19 07:44:44 UTC (rev 633) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.content.demande; +/* + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.DemandType; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-18 14:39:45 UTC (rev 632) +++ trunk/pom.xml 2014-09-19 07:44:44 UTC (rev 633) @@ -350,12 +350,6 @@ </dependency> <dependency> - <groupId>com.ezware.oxbow</groupId> - <artifactId>swing-bits</artifactId> - <version>0.5.0</version> - </dependency> - - <dependency> <groupId>org.swinglabs</groupId> <artifactId>pdf-renderer</artifactId> <version>1.0.5</version>

1 0

r632 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: echatellier Date: 2014-09-18 16:39:45 +0200 (Thu, 18 Sep 2014) New Revision: 632 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/632 Log: Add usefull log 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/EmailServiceImpl.java 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-09-18 14:23:20 UTC (rev 631) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java 2014-09-18 14:39:45 UTC (rev 632) @@ -133,6 +133,8 @@ @Override public void execute(Connection connection) throws SQLException { + int importedCount = 0; + // attention, le sql à pour cible postgresql, mssql, h2, il doit rester simple String query = String.format("SELECT %s, %s, %s, %s, %s, %s, %s, %s, %s, %s FROM %s", NewClient.PROPERTY_NAME, @@ -247,12 +249,18 @@ client.setFaxNumbers(faxNumbers); client = clientDao.update(client); } + + importedCount++; } // delete all rows stat = connection.createStatement(); stat.execute("DELETE FROM " + NewClient.class.getSimpleName()); + // usefull log info (do not remove) + if (importedCount > 0 && log.isInfoEnabled()) { + log.info(String.format("Imported %d new client rows", importedCount)); + } } }); 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-18 14:23:20 UTC (rev 631) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-18 14:39:45 UTC (rev 632) @@ -1231,6 +1231,8 @@ @Override public void execute(Connection connection) throws SQLException { + int importedCount = 0; + // attention, le sql à pour cible postgresql, mssql, h2, il doit rester simple String query = String.format("SELECT %s, %s, %s FROM %s", EdiReturn.PROPERTY_RANGE_ROW_TOPIA_ID, @@ -1273,11 +1275,18 @@ email.setDemandStatus(DemandStatus.IN_PROGRESS); emailsToUpdate.add(email); + + importedCount++; } // delete all rows stat = connection.createStatement(); stat.execute("DELETE FROM " + EdiReturn.class.getSimpleName()); + + // usefull log info (do not remove) + if (importedCount > 0 && log.isInfoEnabled()) { + log.info(String.format("Imported %d ediReturn rows", importedCount)); + } } });

1 0

r631 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: kmorin Date: 2014-09-18 16:23:20 +0200 (Thu, 18 Sep 2014) New Revision: 631 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/631 Log: fixes #5818 L'application reste bloqu?\195?\169e Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 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-09-18 14:17:26 UTC (rev 630) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-18 14:23:20 UTC (rev 631) @@ -368,7 +368,11 @@ // ok save //saveAction.actionPerformed(null); //XXX echatellier 2010731 : action bloquante - getContext().getActionEngine().runActionAndWait(saveAction); + if (getContext().isActionInProgress(null)) { + getContext().getActionEngine().runInternalAction(saveAction); + } else { + getContext().getActionEngine().runActionAndWait(saveAction); + } result = true; break; case JOptionPane.NO_OPTION:

1 0

r630 - trunk/faxtomail-ui-swing/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: echatellier Date: 2014-09-18 16:17:26 +0200 (Thu, 18 Sep 2014) New Revision: 630 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/630 Log: Fix i18n encoding Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 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-18 14:10:56 UTC (rev 629) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-09-18 14:17:26 UTC (rev 630) @@ -307,8 +307,8 @@ jaxx.application.error.cannot.mail=Erreur lors de l'ouverture du client mail jaxx.application.error.cannot.open=Erreur lors de l'ouverture de la pièce jointe jaxx.application.error.cannot.print=Erreur lors de l'impression -jaxx.application.error.desktop.edit.not.supported=L'action d'edition des fichiers par le syst�me n'est pas support� -jaxx.application.error.desktop.not.supported=L'ouverture des fichiers par le syst�me n'est pas support� +jaxx.application.error.desktop.edit.not.supported=L'action d'edition des fichiers par le système n'est pas supporté +jaxx.application.error.desktop.not.supported=L'ouverture des fichiers par le système n'est pas supporté jaxx.application.error.desktop.print.not.supported=Erreur lors de l'impression jaxx.application.error.noPrinter=Erreur lors de l'impression swing.error.cannot.copy.file=Erreur lors de la copie des fichiers

1 0

r629 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search
by kmorin＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: kmorin Date: 2014-09-18 16:10:56 +0200 (Thu, 18 Sep 2014) New Revision: 629 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/629 Log: fixes #5817 [Recherche pour grouper] la position du s?\195?\169parateur n'est pas conserv?\195?\169e quand on quitte et retourne sur la recherche Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 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-09-18 13:43:09 UTC (rev 628) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-09-18 14:10:56 UTC (rev 629) @@ -225,6 +225,8 @@ updateResultPerPage(e); } }); + + getContext().getSwingSession().add(ui, true); } public void searchDemandes() { @@ -307,6 +309,7 @@ @Override public void cancel() { + getContext().getSwingSession().updateState(); closeFrame(); }

1 0

r628 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: content/pdfeditor util
by kmorin＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: kmorin Date: 2014-09-18 15:43:09 +0200 (Thu, 18 Sep 2014) New Revision: 628 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/628 Log: - fix potential npe - set the topest ui for the quit dialog to have the pdf editor has parent 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/util/AbstractFaxToMailUIHandler.java 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-09-18 13:34:55 UTC (rev 627) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-09-18 13:43:09 UTC (rev 628) @@ -268,8 +268,13 @@ ); return result; } - + @Override + public Component getTopestUI() { + return getUI(); + } + + @Override public void onCloseUI() { } 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-09-18 13:34:55 UTC (rev 627) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-18 13:43:09 UTC (rev 628) @@ -395,13 +395,15 @@ } protected void closeFrame(JFrame frame, AbstractApplicationUIHandler handler) { - boolean canClose = true; - if (handler instanceof CloseableUI) { - canClose = ((CloseableUI) handler).quitUI(); + if (frame != null) { + boolean canClose = true; + if (handler instanceof CloseableUI) { + canClose = ((CloseableUI) handler).quitUI(); + } + if (canClose) { + frame.dispose(); + } } - if (canClose) { - frame.dispose(); - } } protected <HL extends HasLabel> void initCheckBoxComboBox(final JComboBox<HL> comboBox,

1 0

r627 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by echatellier＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: echatellier Date: 2014-09-18 15:34:55 +0200 (Thu, 18 Sep 2014) New Revision: 627 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/627 Log: Modification de performance pour les requette contenant ou pas des 'null' Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 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-09-18 13:06:47 UTC (rev 626) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-18 13:34:55 UTC (rev 627) @@ -936,7 +936,7 @@ Set<Object> result = new HashSet<>(queryResults); // check if the property is sometimes null - if (property.startsWith("rangeRow.")) { + /*if (property.startsWith("rangeRow.")) { query = "FROM " + Email.class.getName() + " AS email" + " LEFT OUTER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow" + folderAndStatusCondition + " AND rangeRow IS NULL"; @@ -964,7 +964,12 @@ if (!queryResults.isEmpty()) { result.add(null); } - } + }*/ + + // TODO echatellier 20140918 : on ajoute null dans tous les cas car les requetes precendente + // sont trop lente juste pour savoir si on a vraiment besoin de savoir si l'on doit vraiment + // avoir des valeurs nulles + result.add(null); return result; } 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-09-18 13:06:47 UTC (rev 626) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-18 13:34:55 UTC (rev 627) @@ -210,12 +210,17 @@ log.debug("result size " + result.size() + " " + result); } for (Object o : result) { - Date date = (Date) o; - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.set(Calendar.SECOND, 0); - cal.set(Calendar.MILLISECOND, 0); - filteredDates.add(cal.getTime()); + + // le dao revoie toujours null, meme si le cas est impossible en theorie pour + // PROPERTY_RECEPTION_DATE, donc dans ce cas, on ignore le cas null + if (o != null) { + Date date = (Date) o; + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.set(Calendar.SECOND, 0); + cal.set(Calendar.MILLISECOND, 0); + filteredDates.add(cal.getTime()); + } } result = new HashSet<Object>(filteredDates); }

1 0

r626 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: echatellier Date: 2014-09-18 15:06:47 +0200 (Thu, 18 Sep 2014) New Revision: 626 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/626 Log: Add usefull log Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-09-18 12:54:30 UTC (rev 625) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-09-18 13:06:47 UTC (rev 626) @@ -238,6 +238,9 @@ * @param folder the folder to check */ protected void checkEmailsOfFolder(EmailAccount emailAccount, Folder folder) { + + int importedCount = 0; + try { folder.open(Folder.READ_WRITE); @@ -478,6 +481,7 @@ email.getClient() != null ? email.getClient().getCode() : null, null, modifiedProperties.toArray(new String[modifiedProperties.size()])); + importedCount++; if (log.isDebugEnabled()) { log.debug(" ==> Message placé dans le dossier " + email.getMailFolder().getName()); @@ -497,6 +501,11 @@ } catch (Exception e) { log.error("Error while reading the emails", e); } + + // usefull log info (do not remove) + if (importedCount > 0 && log.isInfoEnabled()) { + log.info(String.format("Imported %d mail for account %s@%s", importedCount, emailAccount.getLogin(), emailAccount.getHost())); + } } /**

1 0

r625 - trunk/faxtomail-service/src/main/resources/db/migration/sqlserver
by echatellier＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: echatellier Date: 2014-09-18 14:54:30 +0200 (Thu, 18 Sep 2014) New Revision: 625 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/625 Log: Correction du code de migration SQL server Modified: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_620__modification_newclient_edireturn.sql Modified: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_620__modification_newclient_edireturn.sql =================================================================== --- trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_620__modification_newclient_edireturn.sql 2014-09-18 12:52:45 UTC (rev 624) +++ trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_620__modification_newclient_edireturn.sql 2014-09-18 12:54:30 UTC (rev 625) @@ -4,13 +4,13 @@ GO create table newClient ( name varchar(MAX), - emailAddress varchar(MAX), - faxNumber varchar(MAX), + emailAddress varchar(255), + faxNumber varchar(255), caracteristic1 varchar(MAX), caracteristic2 varchar(MAX), caracteristic3 varchar(MAX), - code varchar(MAX) not null, - company varchar(MAX) not null, + code varchar(255) not null, + company varchar(255) not null, brand varchar(MAX), personInCharge varchar(MAX), unique (code, company, emailAddress, faxNumber) @@ -35,14 +35,16 @@ -- add company in client --drop constraint UK_b4ck8pelycojqmbrd8n36mdfw; -alter table client drop emailAddress; -alter table client drop faxNumber; -alter table client drop id; +alter table client drop column emailAddress; +alter table client drop column faxNumber; +alter table client drop column id; -alter table client add company text not NULL; +alter table client add company varchar(255) not NULL; alter table client add emailAddressesJson varchar(MAX); alter table client add faxNumbersJson varchar(MAX); -alter table client alter brand drop not NULL; +alter table client alter column code varchar(255) not NULL; +alter table client alter column brand varchar(MAX) not NULL; + alter table client add constraint UK_kqpy7y2f4onck5julevr0hfg1 unique (code, company); GO

1 0