Faxtomail-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
August 2014
- 4 participants
- 141 discussions
r557 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit
by echatellier@users.forge.codelutin.com 14 Aug '14
by echatellier@users.forge.codelutin.com 14 Aug '14
14 Aug '14
Author: echatellier
Date: 2014-08-14 10:27:36 +0200 (Thu, 14 Aug 2014)
New Revision: 557
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/557
Log:
Retrait total de la gestion des types de demande pour le d?\195?\169placement
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/MailFolderServiceImpl.java
trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java
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-08-14 08:22:58 UTC (rev 556)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-08-14 08:27:36 UTC (rev 557)
@@ -29,7 +29,6 @@
import java.util.Map;
import java.util.Set;
-import com.franciaflex.faxtomail.persistence.entities.DemandType;
import com.franciaflex.faxtomail.persistence.entities.EtatAttente;
import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser;
import com.franciaflex.faxtomail.persistence.entities.MailFilter;
@@ -56,7 +55,7 @@
List<MailFolder> getMailFolders(Collection<String> ids);
- Collection<MailFolder> getFoldersWithEtatAttenteAndDemandType(Set<EtatAttente> etatAttentes, Set<DemandType> demandTypes);
+ Collection<MailFolder> getFoldersWithEtatAttente(Set<EtatAttente> etatAttentes);
Map<String, Long> getMailFoldersUsage();
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-08-14 08:22:58 UTC (rev 556)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-08-14 08:27:36 UTC (rev 557)
@@ -246,11 +246,10 @@
}
/**
- * Retourne les dossiers qui ont l'ensemble des etats d'attente et l'ensemble des types de
- * demande compatible avec ceux en argument.
+ * Retourne les dossiers qui ont l'ensemble des etats d'attente compatible avec ceux en argument.
*/
@Override
- public Set<MailFolder> getFoldersWithEtatAttenteAndDemandType(Set<EtatAttente> requiredEtatAttentes, Set<DemandType> requiredDemandTypes) {
+ public Set<MailFolder> getFoldersWithEtatAttente(Set<EtatAttente> requiredEtatAttentes) {
Set<MailFolder> result = new HashSet<>();
MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao();
@@ -258,7 +257,7 @@
for (MailFolder root : roots) {
Collection<MailFolder> mailFolders = getFoldersWithEtatAttente(root, new HashSet<EtatAttente>(),
- new HashSet<DemandType>(), requiredEtatAttentes, requiredDemandTypes);
+ new HashSet<DemandType>(), requiredEtatAttentes);
result.addAll(mailFolders);
}
@@ -268,8 +267,7 @@
protected Collection<MailFolder> getFoldersWithEtatAttente(MailFolder folder,
Collection<EtatAttente> parentEtatAttente,
Collection<DemandType> parentDemandType,
- Set<EtatAttente> requiredEtatAttentes,
- Set<DemandType> requiredDemandTypes) {
+ Set<EtatAttente> requiredEtatAttentes) {
Collection<EtatAttente> etatAttentes = folder.getEtatAttentes();
if (CollectionUtils.isEmpty(etatAttentes)) {
etatAttentes = parentEtatAttente;
@@ -289,23 +287,16 @@
if (children != null) {
for (MailFolder child : children) {
Collection<MailFolder> subMailFolders = getFoldersWithEtatAttente(child,
- parentEtatAttente, parentDemandType, requiredEtatAttentes, requiredDemandTypes);
+ parentEtatAttente, parentDemandType, requiredEtatAttentes);
result.addAll(subMailFolders);
}
}
// pour qu'un dossier soit sélectionné il faut que les dossiers ait des etat d'attentes (ou ses parents)
// que les etats d'attente requis ne soit pas vide
- // ET
- // qu'un dossier ait des types de demandes et que les types de demande requis ne soit pas
- // vide
if ((CollectionUtils.isEmpty(etatAttentes) ||
CollectionUtils.isEmpty(requiredEtatAttentes) ||
- etatAttentes.containsAll(requiredEtatAttentes))
- &&
- CollectionUtils.isEmpty(demandTypes) ||
- CollectionUtils.isEmpty(requiredDemandTypes) ||
- demandTypes.containsAll(requiredDemandTypes)) {
+ etatAttentes.containsAll(requiredEtatAttentes))) {
result.add(folder);
}
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-08-14 08:22:58 UTC (rev 556)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-08-14 08:27:36 UTC (rev 557)
@@ -72,7 +72,6 @@
// on recupere seulement les dossiers qui accepte l'ensemble des états d'attentes de l'ensemble des demandes
Set<EtatAttente> allEtatsAttentes = new HashSet<EtatAttente>();
- Set<DemandType> allDemandTypes = new HashSet<DemandType>();
for (DemandeUIModel demande : model.getDemandeUIModels()) {
if (demande.getEtatAttente() != null) {
allEtatsAttentes.add(demande.getEtatAttente());
@@ -83,8 +82,8 @@
Collection<MailFolder> foldersWithEtatAttente = null;
// foldersWithEtatAttente reste à null dans le cas ou l'arbre ne doit pas être filtré
// sinon l'appel peut renvoyer une liste de vide dans le cas où aucun dossier n'est selectionnable
- if (!allEtatsAttentes.isEmpty() || !allDemandTypes.isEmpty()) {
- foldersWithEtatAttente = serviceContext.getMailFolderService().getFoldersWithEtatAttenteAndDemandType(allEtatsAttentes, allDemandTypes);
+ if (!allEtatsAttentes.isEmpty()) {
+ foldersWithEtatAttente = serviceContext.getMailFolderService().getFoldersWithEtatAttente(allEtatsAttentes);
}
// init tree
1
0
r556 - trunk/faxtomail-ui-swing/src/main/resources/i18n
by echatellier@users.forge.codelutin.com 14 Aug '14
by echatellier@users.forge.codelutin.com 14 Aug '14
14 Aug '14
Author: echatellier
Date: 2014-08-14 10:22:58 +0200 (Thu, 14 Aug 2014)
New Revision: 556
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/556
Log:
Fix i18n
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-08-14 07:35:48 UTC (rev 555)
+++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-08-14 08:22:58 UTC (rev 556)
@@ -249,7 +249,7 @@
faxtomail.reply.attachment.label=%1$s (%2$s ko)
faxtomail.reply.attachments.add.label=Ajouter des pièces jointes
faxtomail.reply.attachments.title=Pièces-jointes (%1$s / %2$s ko autorisés)
-faxtomail.reply.forward=Tranfer de la réponse \: %s
+faxtomail.reply.forward=Transfert de la réponse \: %s
faxtomail.reply.forwardsubject=Tr\: %s
faxtomail.reply.label.cc=Copie \:
faxtomail.reply.label.cci=Copie cachée \:
1
0
14 Aug '14
Author: echatellier
Date: 2014-08-14 09:35:48 +0200 (Thu, 14 Aug 2014)
New Revision: 555
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/555
Log:
Add svn keywords
Modified:
trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java
trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.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/service/ClientService.java
trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java
trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.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/LdapService.java
trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java
trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java
trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.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/exceptions/FolderNotReadableException.java
trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_442__move_object_to_folder_configuration.sql
trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_448__add_mail_folder_level_configuration.sql
trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_454__add_ldap_config.sql
trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql
trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_520__add_performance_indexes.sql
trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_442__move_object_to_folder_configuration.sql
trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_448__add_mail_folder_level_configuration.sql
trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_454__add_ldap_config.sql
trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql
trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_520__add_performance_indexes.sql
trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_442__move_object_to_folder_configuration.sql
trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_448__add_mail_folder_level_configuration.sql
trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_454__add_ldap_config.sql
trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql
trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_520__add_performance_indexes.sql
trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java
trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java
trunk/faxtomail-service/src/test/resources/archives/archives.csv
trunk/faxtomail-service/src/test/resources/archives/att1.txt
trunk/faxtomail-service/src/test/resources/archives/att2.txt
trunk/faxtomail-service/src/test/resources/db/h2data-1_0_0_rc2.h2.db
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/OpenGroupedDemandAction.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/resources/icons/action-hline.png
trunk/faxtomail-ui-swing/src/main/resources/icons/action-vline.png
trunk/faxtomail-ui-web/src/main/webapp/js/select2.js
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Persistence
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceFactory.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceFactory.java
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceInvocationHandler.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceInvocationHandler.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_442__move_object_to_folder_configuration.sql
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_448__add_mail_folder_level_configuration.sql
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_454__add_ldap_config.sql
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_520__add_performance_indexes.sql
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_442__move_object_to_folder_configuration.sql
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_448__add_mail_folder_level_configuration.sql
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_454__add_ldap_config.sql
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_520__add_performance_indexes.sql
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_442__move_object_to_folder_configuration.sql
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_448__add_mail_folder_level_configuration.sql
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_454__add_ldap_config.sql
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_520__add_performance_indexes.sql
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: Service
- * $Id: AbstractFaxToMailServiceTest.java 477 2014-08-06 08:46:09Z echatellier $
- * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-service/src/test/java/c… $
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/test/resources/archives/archives.csv
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/test/resources/archives/att1.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/test/resources/archives/att2.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-service/src/test/resources/db/h2data-1_0_0_rc2.h2.db
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -1,5 +1,29 @@
package com.franciaflex.faxtomail.ui.swing.actions;
+/*
+ * #%L
+ * FaxToMail :: UI
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2014 Franciaflex, Code Lutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
import com.franciaflex.faxtomail.persistence.entities.Attachment;
import com.franciaflex.faxtomail.persistence.entities.AttachmentFile;
import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl;
Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java
___________________________________________________________________
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/actions/AddAttachmentToReplyAction.java
===================================================================
--- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java 2014-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -1,5 +1,29 @@
package com.franciaflex.faxtomail.ui.swing.actions;
+/*
+ * #%L
+ * FaxToMail :: UI
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2014 Franciaflex, Code Lutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
import com.franciaflex.faxtomail.persistence.entities.Attachment;
import com.franciaflex.faxtomail.persistence.entities.AttachmentFile;
import com.franciaflex.faxtomail.services.service.EmailService;
Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java
___________________________________________________________________
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/actions/OpenGroupedDemandAction.java
===================================================================
--- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -3,8 +3,8 @@
/*
* #%L
* FaxToMail :: UI
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2014 Franciaflex, Code Lutin
* %%
Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java
___________________________________________________________________
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/actions/SaveAndOpenChooseAttachmentToPrintAction.java
===================================================================
--- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java 2014-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -1,5 +1,29 @@
package com.franciaflex.faxtomail.ui.swing.actions;
+/*
+ * #%L
+ * FaxToMail :: UI
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2014 Franciaflex, Code Lutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
import com.franciaflex.faxtomail.persistence.entities.MailFolder;
import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI;
import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler;
Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java
___________________________________________________________________
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/actions/SaveAndOpenMailFolderChooserAction.java
===================================================================
--- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java 2014-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -1,5 +1,29 @@
package com.franciaflex.faxtomail.ui.swing.actions;
+/*
+ * #%L
+ * FaxToMail :: UI
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2014 Franciaflex, Code Lutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI;
import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel;
import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler;
Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java
___________________________________________________________________
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/actions/SaveAndOpenModalFrameAction.java
===================================================================
--- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -1,5 +1,29 @@
package com.franciaflex.faxtomail.ui.swing.actions;
+/*
+ * #%L
+ * FaxToMail :: UI
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2014 Franciaflex, Code Lutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler;
import org.nuiton.jaxx.application.swing.ApplicationUI;
Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java
___________________________________________________________________
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/actions/SaveAndOpenReplyFormAction.java
===================================================================
--- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java 2014-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -1,5 +1,29 @@
package com.franciaflex.faxtomail.ui.swing.actions;
+/*
+ * #%L
+ * FaxToMail :: UI
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2014 Franciaflex, Code Lutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
import com.franciaflex.faxtomail.persistence.entities.MailFolder;
import com.franciaflex.faxtomail.services.FaxToMailServiceUtils;
import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI;
Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
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-08-13 17:19:46 UTC (rev 554)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java 2014-08-14 07:35:48 UTC (rev 555)
@@ -1,5 +1,29 @@
package com.franciaflex.faxtomail.ui.swing.actions;
+/*
+ * #%L
+ * FaxToMail :: UI
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2014 Franciaflex, Code Lutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI;
import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler;
import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUI;
Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-hline.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-vline.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/select2.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
1
0
r554 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: actions content/attachment content/demande content/print util
by kmorin@users.forge.codelutin.com 13 Aug '14
by kmorin@users.forge.codelutin.com 13 Aug '14
13 Aug '14
Author: kmorin
Date: 2014-08-13 19:19:46 +0200 (Wed, 13 Aug 2014)
New Revision: 554
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/554
Log:
am?\195?\169lioration des actions
Added:
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/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
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/GenerateAnnotatedAttachmentAction.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/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/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/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.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/AbstractToolbarPopupHandler.java
Added: 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 (rev 0)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -0,0 +1,48 @@
+package com.franciaflex.faxtomail.ui.swing.actions;
+
+import com.franciaflex.faxtomail.persistence.entities.Attachment;
+import com.franciaflex.faxtomail.persistence.entities.AttachmentFile;
+import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl;
+import com.franciaflex.faxtomail.services.FaxToMailServiceContext;
+import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI;
+import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIHandler;
+import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIModel;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+import static org.nuiton.i18n.I18n.t;
+
+/**
+ * @author Kevin Morin (Code Lutin)
+ */
+public class AddAttachmentAction extends AbstractFaxToMailAction<AttachmentEditorUIModel, AttachmentEditorUI, AttachmentEditorUIHandler> {
+
+ public AddAttachmentAction(AttachmentEditorUIHandler handler) {
+ super(handler, false);
+ }
+
+ @Override
+ public void doAction() throws Exception {
+ Attachment attachment = new AttachmentImpl();
+ attachment.setAddedByUser(true);
+ File file = getUI().getFile().getSelectedFile();
+ if (file != null) {
+ try {
+ // warning, this not NOT be closed (will be by blob on commit)
+ InputStream is = new FileInputStream(file);
+ FaxToMailServiceContext serviceContext = getContext().newServiceContext();
+ AttachmentFile attachmentFile = serviceContext.getEmailService().getAttachmentFileFromStream(is);
+ attachmentFile.setFilename(file.getName());
+ attachment.setOriginalFile(attachmentFile);
+
+ } catch (Exception e) {
+ getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.copy.file"), e);
+ }
+
+ getModel().addAttachment(attachment);
+ getUI().getFile().setSelectedFilePath(null);
+ }
+ }
+}
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-08-13 16:22:32 UTC (rev 553)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -74,17 +74,20 @@
}
@Override
- protected void releaseAction() {
- super.releaseAction();
-
+ public void postSuccessAction() {
+ super.postSuccessAction();
MainUI mainUI = getContext().getMainUI();
getHandler().openModalFrame(dialogContent, attachment.getOriginalFileName(), mainUI.getSize())
.addWindowListener(new WindowAdapter() {
- @Override
- public void windowClosed(WindowEvent e) {
- dialogContent.getModel().toEntity(attachment);
- }
- });
+ @Override
+ public void windowClosing(WindowEvent e) {
+ }
+
+ @Override
+ public void windowClosed(WindowEvent e) {
+ dialogContent.getModel().toEntity(attachment);
+ }
+ });
}
}
\ 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-08-13 16:22:32 UTC (rev 553)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -261,7 +261,6 @@
parentUI.getModel().fireAttachmentEdited(model.toEntity());
model.setModify(false);
- model.fromEntity(null);
}
protected int[] computeCoordinates(Component panel, int rotation, float zoom) {
Added: 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 (rev 0)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -0,0 +1,46 @@
+package com.franciaflex.faxtomail.ui.swing.actions;
+
+import com.franciaflex.faxtomail.persistence.entities.MailFolder;
+import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI;
+import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler;
+import com.franciaflex.faxtomail.ui.swing.content.print.AttachmentToPrintChooserUI;
+import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUI;
+
+import java.awt.*;
+
+import static org.nuiton.i18n.I18n.t;
+
+/**
+ * @author Kevin Morin (Code Lutin)
+ */
+public class SaveAndOpenChooseAttachmentToPrintAction extends SaveAndOpenModalFrameAction<AttachmentToPrintChooserUI> {
+
+ public SaveAndOpenChooseAttachmentToPrintAction(DemandesUIHandler handler) {
+ super(handler);
+ }
+
+ @Override
+ public String getTitle() {
+ return t("faxtomail.chooseAttachmentToPrint.title");
+ }
+
+ @Override
+ public Dimension getDimension() {
+ return new Dimension(350, 500);
+ }
+
+ @Override
+ public void doAction() throws Exception {
+ MailFolder selectedFolder = getModel().getMailFolder();
+ while (selectedFolder.getParent() != null && selectedFolder.getPrintActionEqualTakeAction() == null) {
+ selectedFolder = selectedFolder.getParent();
+ }
+ boolean take = Boolean.TRUE.equals(selectedFolder.getPrintActionEqualTakeAction());
+ setTakeIfNotTaken(take);
+
+ super.doAction();
+
+ frameContent = new AttachmentToPrintChooserUI(getUI(), getModel());
+
+ }
+}
Added: 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 (rev 0)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -0,0 +1,44 @@
+package com.franciaflex.faxtomail.ui.swing.actions;
+
+import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI;
+import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel;
+import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler;
+import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUI;
+import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUIModel;
+
+import java.awt.*;
+import java.util.*;
+
+import static org.nuiton.i18n.I18n.t;
+
+/**
+ * @author Kevin Morin (Code Lutin)
+ */
+public class SaveAndOpenMailFolderChooserAction extends SaveAndOpenModalFrameAction<MailFolderChooserUI> {
+
+ public SaveAndOpenMailFolderChooserAction(DemandesUIHandler handler) {
+ super(handler);
+ }
+
+ @Override
+ public String getTitle() {
+ return t("faxtomail.chooseMailFolder.title");
+ }
+
+ @Override
+ public Dimension getDimension() {
+ return new Dimension(350, 500);
+ }
+
+ @Override
+ public void doAction() throws Exception {
+ super.doAction();
+
+ java.util.List<DemandeUIModel> demandes = Collections.singletonList(getModel());
+
+ MailFolderChooserUIModel model = new MailFolderChooserUIModel();
+ model.setDemandeUIModels(demandes);
+
+ frameContent = new MailFolderChooserUI(getUI(), model);
+ }
+}
Added: 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 (rev 0)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -0,0 +1,28 @@
+package com.franciaflex.faxtomail.ui.swing.actions;
+
+import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler;
+import org.nuiton.jaxx.application.swing.ApplicationUI;
+
+import java.awt.*;
+
+/**
+ * @author Kevin Morin (Code Lutin)
+ */
+public abstract class SaveAndOpenModalFrameAction<FC extends ApplicationUI> extends SaveDemandeAction {
+
+ protected FC frameContent;
+
+ public SaveAndOpenModalFrameAction(DemandesUIHandler handler) {
+ super(handler.getCurrentDemandHandler());
+ }
+
+ public abstract String getTitle();
+
+ public abstract Dimension getDimension();
+
+ @Override
+ public void postSuccessAction() {
+ super.postSuccessAction();
+ getHandler().openModalFrame(frameContent, getTitle(), getDimension());
+ }
+}
Added: 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 (rev 0)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -0,0 +1,54 @@
+package com.franciaflex.faxtomail.ui.swing.actions;
+
+import com.franciaflex.faxtomail.persistence.entities.MailFolder;
+import com.franciaflex.faxtomail.services.FaxToMailServiceUtils;
+import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI;
+import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler;
+import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel;
+import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler;
+import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI;
+import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIModel;
+import jaxx.runtime.JAXXUtil;
+
+import java.awt.*;
+
+import static org.nuiton.i18n.I18n.t;
+
+/**
+ * @author Kevin Morin (Code Lutin)
+ */
+public class SaveAndOpenReplyFormAction extends SaveAndOpenModalFrameAction<ReplyFormUI> {
+
+ public SaveAndOpenReplyFormAction(DemandesUIHandler handler) {
+ super(handler);
+ setTakeIfNotTaken(true);
+ }
+
+ @Override
+ public String getTitle() {
+ return t("faxtomail.reply.title", getModel().getTitle());
+ }
+
+ @Override
+ public Dimension getDimension() {
+ return new Dimension(800, 600);
+ }
+
+ @Override
+ public void doAction() throws Exception {
+ super.doAction();
+
+ frameContent = new ReplyFormUI(getUI());
+ ReplyFormUIModel model = frameContent.getModel();
+ DemandeUIModel currentDemand = getModel();
+
+ model.setOriginalDemand(currentDemand);
+
+ String sender = JAXXUtil.getStringValue(currentDemand.getSender());
+ if (currentDemand.isFax()) {
+ MailFolder selectedFolder = getContext().getCurrentMailFolder();
+ sender = FaxToMailServiceUtils.addFaxDomainToFaxNumber(sender, selectedFolder);
+ }
+ model.setTo(sender);
+ }
+}
Added: 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 (rev 0)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -0,0 +1,36 @@
+package com.franciaflex.faxtomail.ui.swing.actions;
+
+import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI;
+import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler;
+import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUI;
+
+import java.awt.*;
+
+import static org.nuiton.i18n.I18n.t;
+
+/**
+ * @author Kevin Morin (Code Lutin)
+ */
+public class SaveAndOpenSearchToGroupAction extends SaveAndOpenModalFrameAction<SearchToGroupUI> {
+
+ public SaveAndOpenSearchToGroupAction(DemandesUIHandler handler) {
+ super(handler);
+ }
+
+ @Override
+ public String getTitle() {
+ return t("faxtomail.searchToGroup.title", getModel().getTitle());
+ }
+
+ @Override
+ public Dimension getDimension() {
+ return getContext().getMainUI().getSize();
+ }
+
+ @Override
+ public void doAction() throws Exception {
+ super.doAction();
+
+ frameContent = new SearchToGroupUI(getUI());
+ }
+}
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-08-13 16:22:32 UTC (rev 553)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -128,7 +128,6 @@
@Override
public void onAttachmentEdited(Attachment attachment) {
String topiaId = model.getTopiaId();
- //TODO kmorin 20140813 action
FaxToMailServiceContext serviceContext = context.newServiceContext();
Email email = serviceContext.getEmailService().addToHistory(topiaId,
HistoryType.ATTACHMENT_MODIFICATION,
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-08-13 16:22:32 UTC (rev 553)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css 2014-08-13 17:19:46 UTC (rev 554)
@@ -54,5 +54,6 @@
actionIcon: add;
toolTipText: "faxtomail.attachmentEditor.action.add.tip";
enabled: { model.isEditable() };
+ _applicationAction: { com.franciaflex.faxtomail.ui.swing.actions.AddAttachmentAction.class };
}
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-08-13 16:22:32 UTC (rev 553)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.jaxx 2014-08-13 17:19:46 UTC (rev 554)
@@ -65,8 +65,7 @@
<FileEditor id='file'/>
</cell>
<cell fill='both' rows='3'>
- <JButton id='addButton'
- onActionPerformed='handler.addAttachment()'/>
+ <JButton id='addButton'/>
</cell>
</row>
</Table>
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-08-13 16:22:32 UTC (rev 553)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -152,32 +152,6 @@
return null;
}
- public void addAttachment() {
- Attachment attachment = new AttachmentImpl();
- attachment.setAddedByUser(true);
- File file = ui.getFile().getSelectedFile();
- if (file != null) {
- try {
- // warning, this not NOT be closed (will be by blob on commit)
- //TODO kmorin 20140813 action ?
- InputStream is = new FileInputStream(file);
- FaxToMailServiceContext serviceContext = getContext().newServiceContext();
- AttachmentFile attachmentFile = serviceContext.getEmailService().getAttachmentFileFromStream(is);
- attachmentFile.setFilename(file.getName());
- attachment.setOriginalFile(attachmentFile);
-
- } catch (Exception e) {
- getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.copy.file"), e);
- }
- getModel().addAttachment(attachment);
- resetFields();
- }
- }
-
- protected void resetFields() {
- ui.getFile().setSelectedFilePath(null);
- }
-
public void openAttachment(Attachment attachment) {
openAttachmentAction.setAttachment(attachment, true);
getContext().getActionFactory().createUIAction(null, openAttachmentAction).actionPerformed(null);
@@ -187,7 +161,6 @@
AttachmentEditorUIModel model = getModel();
if (model.isEditable() && FaxToMailUIUtil.isFileTypeEditable(attachment.getOriginalFileName())) {
-
editAttachmentAction.setAttachment(attachment);
getContext().getActionEngine().runAction(editAttachmentAction);
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-08-13 16:22:32 UTC (rev 553)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -354,7 +354,7 @@
@Override
public void onAttachmentOpened(Attachment attachment, boolean original) {
String topiaId = getModel().getTopiaId();
- if (topiaId != null) {
+ if (topiaId != null && attachment.isPersisted()) {
String filename;
if (original) {
filename = attachment.getOriginalFileName();
@@ -374,7 +374,7 @@
@Override
public void onAttachmentEdited(Attachment attachment) {
String topiaId = getModel().getTopiaId();
- if (topiaId != null) {
+ if (topiaId != null && attachment.isPersisted()) {
FaxToMailServiceContext serviceContext = getContext().newServiceContext();
Email email = serviceContext.getEmailService().addToHistory(topiaId,
HistoryType.ATTACHMENT_MODIFICATION,
@@ -386,7 +386,6 @@
getModel().setModify(true);
}
-
}
);
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-08-13 16:22:32 UTC (rev 553)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -27,24 +27,25 @@
import static org.nuiton.i18n.I18n.t;
import java.awt.Component;
-import java.awt.Dimension;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.util.Collections;
-import java.util.List;
import javax.swing.DefaultSingleSelectionModel;
import javax.swing.JComponent;
import javax.swing.JTabbedPane;
+import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenChooseAttachmentToPrintAction;
+import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenMailFolderChooserAction;
+import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenReplyFormAction;
+import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenSearchToGroupAction;
import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeAction;
-import jaxx.runtime.JAXXUtil;
import jaxx.runtime.validator.swing.SwingValidator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler;
import org.nuiton.jaxx.application.swing.ApplicationUI;
+import org.nuiton.jaxx.application.swing.action.AbstractApplicationAction;
import org.nuiton.jaxx.application.swing.tab.CustomTab;
import org.nuiton.jaxx.application.swing.tab.DelegateTabContainerHandler;
import org.nuiton.jaxx.application.swing.tab.TabContainerHandler;
@@ -56,16 +57,9 @@
import com.franciaflex.faxtomail.persistence.entities.Email;
import com.franciaflex.faxtomail.persistence.entities.EtatAttente;
import com.franciaflex.faxtomail.persistence.entities.MailAction;
-import com.franciaflex.faxtomail.persistence.entities.MailFolder;
-import com.franciaflex.faxtomail.services.FaxToMailServiceUtils;
import com.franciaflex.faxtomail.ui.swing.actions.ArchiveAction;
import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeAndExitAction;
-import com.franciaflex.faxtomail.ui.swing.content.print.AttachmentToPrintChooserUI;
-import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI;
-import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIModel;
import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUI;
-import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUI;
-import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUIModel;
import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler;
/**
@@ -336,32 +330,12 @@
public void transmitDemande() {
closeButtonPopups();
-
- saveCurrentDemande(true);
-
- DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent();
- List<DemandeUIModel> demandes = Collections.singletonList(demandeUI.getModel());
-
- MailFolderChooserUIModel model = new MailFolderChooserUIModel();
- model.setDemandeUIModels(demandes);
- MailFolderChooserUI dialogContent = new MailFolderChooserUI(ui, model);
- openModalFrame(dialogContent, t("faxtomail.chooseMailFolder.title"), new Dimension(350, 500));
+ runAction(SaveAndOpenMailFolderChooserAction.class);
}
public void print() {
closeButtonPopups();
-
- MailFolder selectedFolder = getModel().getCurrentDemand().getMailFolder();
- while (selectedFolder.getParent() != null && selectedFolder.getPrintActionEqualTakeAction() == null) {
- selectedFolder = selectedFolder.getParent();
- }
- boolean take = Boolean.TRUE.equals(selectedFolder.getPrintActionEqualTakeAction());
- saveCurrentDemande(take);
-
- DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent();
- AttachmentToPrintChooserUI dialogContent = new AttachmentToPrintChooserUI(ui, demandeUI.getModel());
-
- openModalFrame(dialogContent, t("faxtomail.chooseAttachmentToPrint.title"), new Dimension(350, 500));
+ runAction(SaveAndOpenChooseAttachmentToPrintAction.class);
}
public void archive() {
@@ -373,40 +347,21 @@
public void reply() {
closeButtonPopups();
-
- saveCurrentDemande(true);
-
- ReplyFormUI dialogContent = new ReplyFormUI(ui);
- ReplyFormUIModel model = dialogContent.getModel();
- DemandeUIModel currentDemand = getModel().getCurrentDemand();
-
- model.setOriginalDemand(currentDemand);
-
- String sender = JAXXUtil.getStringValue(currentDemand.getSender());
- if (currentDemand.isFax()) {
- MailFolder selectedFolder = getContext().getCurrentMailFolder();
- sender = FaxToMailServiceUtils.addFaxDomainToFaxNumber(sender, selectedFolder);
- }
- model.setTo(sender);
-
- openModalFrame(dialogContent, t("faxtomail.reply.title", currentDemand.getTitle()), new Dimension(800, 600));
+ runAction(SaveAndOpenReplyFormAction.class);
}
public void group() {
closeButtonPopups();
+ runAction(SaveAndOpenSearchToGroupAction.class);
+ }
- saveCurrentDemande(false);
-
- SearchToGroupUI dialogContent = new SearchToGroupUI(ui);
+ public DemandeUIHandler getCurrentDemandHandler() {
DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent();
- openModalFrame(dialogContent,
- t("faxtomail.searchToGroup.title", demandeUI.getModel().getTitle()),
- getContext().getMainUI().getSize());
+ return demandeUI.getHandler();
}
- protected void saveCurrentDemande(boolean takeIfNotTaken) {
- saveDemandeAction.setTakeIfNotTaken(takeIfNotTaken);
- getContext().getActionEngine().runActionAndWait(saveDemandeAction);
+ public void runAction(Class<? extends AbstractApplicationAction> actionClass) {
+ AbstractApplicationAction action = getContext().getActionFactory().createLogicAction(this, actionClass);
+ getContext().getActionEngine().runAction(action);
}
-
}
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-08-13 16:22:32 UTC (rev 553)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -65,7 +65,6 @@
DemandeUIModel demand = model.getDemand();
// add demand details
- //TODO kmorin 20140813 action ?
FaxToMailServiceContext serviceContext = getContext().newServiceContext();
EmailService emailService = serviceContext.getEmailService();
Email email = getModel().getDemand().toEntity();
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-08-13 16:22:32 UTC (rev 553)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -60,7 +60,6 @@
import jaxx.runtime.SwingUtil;
import jaxx.runtime.swing.editor.bean.BeanUIUtil;
import jaxx.runtime.validator.swing.SwingValidator;
-import org.nuiton.jaxx.application.swing.action.ApplicationActionUIHandler;
import org.nuiton.jaxx.application.swing.util.CloseableUI;
import org.apache.commons.logging.Log;
@@ -326,6 +325,7 @@
}
});
+ result.setAlwaysOnTop(true);
result.setSize(dim);
SwingUtil.center(parentContainer, result);
result.setVisible(true);
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-08-13 16:22:32 UTC (rev 553)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupHandler.java 2014-08-13 17:19:46 UTC (rev 554)
@@ -48,6 +48,8 @@
@Override
public void afterInit(UI ui) {
+ initUI(ui);
+
ui.pack();
ui.setResizable(true);
1
0
Author: echatellier
Date: 2014-08-13 18:22:32 +0200 (Wed, 13 Aug 2014)
New Revision: 553
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/553
Log:
Use topia stable version
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-08-13 16:02:39 UTC (rev 552)
+++ trunk/pom.xml 2014-08-13 16:22:32 UTC (rev 553)
@@ -106,7 +106,7 @@
<nuitonWebVersion>1.16</nuitonWebVersion>
<eugeneVersion>2.13</eugeneVersion>
- <topiaVersion>3.0-SNAPSHOT</topiaVersion>
+ <topiaVersion>3.0-beta-12</topiaVersion>
<hibernateVersion>4.3.6.Final</hibernateVersion>
<h2Version>1.3.176</h2Version>
1
0
r552 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin@users.forge.codelutin.com 13 Aug '14
by kmorin@users.forge.codelutin.com 13 Aug '14
13 Aug '14
Author: kmorin
Date: 2014-08-13 18:02:39 +0200 (Wed, 13 Aug 2014)
New Revision: 552
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/552
Log:
fix import
Modified:
trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.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-08-13 15:56:39 UTC (rev 551)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-08-13 16:02:39 UTC (rev 552)
@@ -89,8 +89,6 @@
import com.franciaflex.faxtomail.ui.swing.actions.ComputeQuantitiesByRangeAction;
import com.franciaflex.faxtomail.ui.swing.actions.LoadFolderEmailsAction;
import com.franciaflex.faxtomail.ui.swing.actions.PrintOnDefaultPrinterAction;
-import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenDialogAction;
-import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeAndExitAction;
import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeFromListAction;
import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI;
import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIModel;
1
0
r551 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: actions content/attachment content/demande content/print content/reply content/transmit util
by kmorin@users.forge.codelutin.com 13 Aug '14
by kmorin@users.forge.codelutin.com 13 Aug '14
13 Aug '14
Author: kmorin
Date: 2014-08-13 17:56:39 +0200 (Wed, 13 Aug 2014)
New Revision: 551
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/551
Log:
am?\195?\169lioration diverses
Added:
trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java
Removed:
trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenDialogAction.java
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/CloseApplicationAction.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/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/TransmitAction.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/AttachmentEditorUIHandler.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/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/DemandesUIHandler.java
trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java
trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java
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/util/AbstractFaxToMailUIHandler.java
Added: 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 (rev 0)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -0,0 +1,46 @@
+package com.franciaflex.faxtomail.ui.swing.actions;
+
+import com.franciaflex.faxtomail.persistence.entities.Attachment;
+import com.franciaflex.faxtomail.persistence.entities.AttachmentFile;
+import com.franciaflex.faxtomail.services.service.EmailService;
+import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyAttachmentModel;
+import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI;
+import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIHandler;
+import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIModel;
+
+/**
+ * @author Kevin Morin (Code Lutin)
+ */
+public class AddAttachmentToReplyAction extends AbstractFaxToMailAction<ReplyFormUIModel, ReplyFormUI, ReplyFormUIHandler> {
+
+ protected ReplyAttachmentModel replyAttachmentModel;
+
+ public AddAttachmentToReplyAction(ReplyFormUIHandler handler) {
+ super(handler, false);
+ setActionDescription("faxtomail.action.addAttachmentToReply.tip");
+ }
+
+ public ReplyAttachmentModel getReplyAttachmentModel() {
+ return replyAttachmentModel;
+ }
+
+ public void setReplyAttachmentModel(ReplyAttachmentModel replyAttachmentModel) {
+ this.replyAttachmentModel = replyAttachmentModel;
+ }
+
+ @Override
+ public void doAction() throws Exception {
+ Attachment attachment = replyAttachmentModel.getAttachment();
+ if (replyAttachmentModel.getAttachmentFile() == null && attachment.isPersisted()) {
+ EmailService service = getContext().newServiceContext().getEmailService();
+ boolean original = replyAttachmentModel.isOriginal();
+ AttachmentFile file = service.getAttachmentFile(attachment.getTopiaId(),
+ original);
+ if (original) {
+ attachment.setOriginalFile(file);
+ } else {
+ attachment.setEditedFile(file);
+ }
+ }
+ }
+}
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveFromListAction.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -26,8 +26,12 @@
import com.franciaflex.faxtomail.persistence.entities.DemandStatus;
import com.franciaflex.faxtomail.persistence.entities.Email;
+import com.franciaflex.faxtomail.persistence.entities.MailFolder;
import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler;
import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel;
+import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
import javax.swing.*;
import java.util.Date;
@@ -62,10 +66,39 @@
@Override
public void doAction() throws Exception {
List<DemandeUIModel> currentEmails = getModel().getSelectedEmails();
+
+ // déplacement du mail dans le dossier d'archive le plus proche
+ // cela permet de déplacer les archives dans d'autre dossier pour leur appliquer
+ // des droits différents
+ // les dossiers d'archive ne sont pas visible dans l'arbre des dossiers, mais les archives
+ // peuvent être consultées dans la recherche
+ MailFolder folder = currentEmails.get(0).getMailFolder();
+ MailFolder archiveChild = null;
+ do {
+ if (folder.getChildren() != null) {
+ Optional<MailFolder> optArchiveChild = Iterables.tryFind(folder.getChildren(), new Predicate<MailFolder>() {
+ @Override
+ public boolean apply(MailFolder mailFolder) {
+ return mailFolder.isArchiveFolder();
+ }
+ });
+ if (optArchiveChild.isPresent()) {
+ archiveChild = optArchiveChild.get();
+ }
+ }
+ folder = folder.getParent();
+
+ } while (archiveChild == null && folder != null);
+
for (DemandeUIModel email : currentEmails) {
email.setArchiveDate(new Date());
email.setDemandStatus(DemandStatus.ARCHIVED);
email.setTakenBy(null);
+ // le dossier d'archive peut ne pas exister. Dans ce cas on laisse le mail dans le dossier
+ // d'origine
+ if (archiveChild != null) {
+ email.setMailFolder(archiveChild);
+ }
}
modifiedProperties = new String[] { Email.PROPERTY_ARCHIVE_DATE };
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -32,21 +32,18 @@
*
* @author kmorin - morin(a)codelutin.com
*/
-public class CloseApplicationAction extends AbstractMainUIFaxToMailAction {
+public class CloseApplicationAction extends AbstractChangeScreenAction {
protected int exitCode = RunFaxToMail.NORMAL_EXIT_CODE;
public CloseApplicationAction(MainUIHandler handler) {
- super(handler, false);
+ super(handler, false, null);
setActionDescription(t("faxtomail.action.exit.tip"));
}
- public void setExitCode(int exitCode) {
- this.exitCode = exitCode;
- }
-
@Override
public void doAction() throws Exception {
+ super.doAction();
RunFaxToMail.closeFaxToMail(getHandler(), exitCode);
}
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -35,6 +35,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
import static org.nuiton.i18n.I18n.t;
/**
@@ -46,6 +49,7 @@
private static final Log log = LogFactory.getLog(EditAttachmentAction.class);
protected Attachment attachment;
+ protected PDFEditorUI dialogContent;
public EditAttachmentAction(AttachmentEditorUIHandler handler) {
super(handler, false);
@@ -59,23 +63,28 @@
@Override
public void doAction() throws Exception {
+ getModel().fireAttachmentOpened(attachment, false);
+
FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment);
+
+ dialogContent = new PDFEditorUI(getUI());
+ PDFEditorUIModel pdfEditorUIModel = dialogContent.getModel();
+ pdfEditorUIModel.fromEntity(attachment);
+ pdfEditorUIModel.setDemand(getContext().getCurrentEmail());
}
@Override
- public void postSuccessAction() {
- super.postSuccessAction();
+ protected void releaseAction() {
+ super.releaseAction();
MainUI mainUI = getContext().getMainUI();
- PDFEditorUI dialogContent = new PDFEditorUI(getUI());
-
- PDFEditorUIModel pdfEditorUIModel = dialogContent.getModel();
- pdfEditorUIModel.fromEntity(attachment);
- pdfEditorUIModel.setDemand(getContext().getCurrentEmail());
-
- getHandler().openModalFrame(dialogContent, attachment.getOriginalFileName(), mainUI.getSize());
- //TODO kmorin 20140813 avant, c'était bloquant vu que c'etait un dialog
- pdfEditorUIModel.toEntity(attachment);
+ getHandler().openModalFrame(dialogContent, attachment.getOriginalFileName(), mainUI.getSize())
+ .addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosed(WindowEvent e) {
+ dialogContent.getModel().toEntity(attachment);
+ }
+ });
}
}
\ 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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -83,11 +83,10 @@
@Override
public void doAction() throws Exception {
- AttachmentFile attachmentFile = getModel().getNotNullFile();
+ PDFEditorUIModel model = getModel();
+ AttachmentFile attachmentFile = model.getNotNullFile();
File file = attachmentFile.getFile();
- PDFEditorUIModel model = getModel();
-
InputStream inputStream = new FileInputStream(file);
PdfReader pdfReader = new PdfReader(inputStream);
@@ -254,9 +253,15 @@
FaxToMailServiceContext serviceContext = getContext().newServiceContext();
AttachmentFile attachmentFileNew = serviceContext.getEmailService().getAttachmentFileFromStream(is);
attachmentFileNew.setRotation(rotation);
- String fileName = getModel().getNotNullFile().getFilename();
+ String fileName = model.getNotNullFile().getFilename();
attachmentFileNew.setFilename(FaxToMailUIUtil.getEditedFileName(fileName));
- getModel().setEditedFile(attachmentFileNew);
+ model.setEditedFile(attachmentFileNew);
+
+ AttachmentEditorUI parentUI = (AttachmentEditorUI) getUI().getContextValue(JAXXContext.class, JAXXUtil.PARENT);
+ parentUI.getModel().fireAttachmentEdited(model.toEntity());
+
+ model.setModify(false);
+ model.fromEntity(null);
}
protected int[] computeCoordinates(Component panel, int rotation, float zoom) {
@@ -331,8 +336,6 @@
@Override
public void postSuccessAction() {
super.postSuccessAction();
-
- AttachmentEditorUI parentUI = (AttachmentEditorUI) getUI().getContextValue(JAXXContext.class, JAXXUtil.PARENT);
- parentUI.getModel().fireAttachmentEdited(getModel().toEntity());
+ getHandler().closeFrame();
}
}
Deleted: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenDialogAction.java
===================================================================
--- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenDialogAction.java 2014-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenDialogAction.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -1,75 +0,0 @@
-package com.franciaflex.faxtomail.ui.swing.actions;
-
-/*
- * #%L
- * FaxToMail :: UI
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2014 Franciaflex, Code Lutin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler;
-import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel;
-import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI;
-
-import java.awt.*;
-
-/**
- * @author Kevin Morin (Code Lutin)
- *
- */
-public class SaveAndOpenDialogAction extends SaveDemandeAction {
-
- protected FaxToMailUI dialogContent;
- protected String title;
- protected Dimension dimension;
- protected boolean takeDemand;
-
- public SaveAndOpenDialogAction(DemandeUIHandler handler,
- FaxToMailUI dialogContent,
- String title,
- Dimension dimension,
- boolean takeDemand) {
- super(handler);
- this.dialogContent = dialogContent;
- this.title = title;
- this.dimension = dimension;
- this.takeDemand = takeDemand;
- }
-
- @Override
- public void doAction() throws Exception {
- DemandeUIModel model = getModel();
- if (takeDemand && model.getTakenBy() == null) {
- model.setTakenBy(getContext().getCurrentUser());
- }
-
- if (getHandler().getMonitor().wasModified()) {
- super.doAction();
- }
- }
-
- @Override
- public void postSuccessAction() {
- super.postSuccessAction();
-
- DemandeUIHandler handler = getHandler();
- handler.openModalFrame(dialogContent, title, dimension);
- }
-}
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -54,11 +54,21 @@
*/
public class SaveDemandeAction extends AbstractFaxToMailAction<DemandeUIModel, DemandeUI, DemandeUIHandler> {
+ protected boolean takeIfNotTaken;
+
public SaveDemandeAction(DemandeUIHandler handler) {
super(handler, false);
setActionDescription(t("faxtomail.action.save.tip"));
}
+ public boolean isTakeIfNotTaken() {
+ return takeIfNotTaken;
+ }
+
+ public void setTakeIfNotTaken(boolean takeIfNotTaken) {
+ this.takeIfNotTaken = takeIfNotTaken;
+ }
+
@Override
public void doAction() throws Exception {
DemandeUIModel model = getModel();
@@ -75,6 +85,7 @@
Collection<RangeRowModel> rows = model.getValidRangeRowModels();
+ //remove null range rows
boolean cont = true;
while (cont) {
try {
@@ -101,12 +112,15 @@
}
FaxToMailUser currentUser = context.getCurrentUser();
+ if (takeIfNotTaken && model.getTakenBy() == null) {
+ model.setTakenBy(getContext().getCurrentUser());
+ }
+
Email email = model.toEntity(persistedEmail);
Collection<Attachment> attachments = model.getAttachment();
String clientCode = model.getClientCode();
BeanMonitor monitor = getHandler().getMonitor();
-
String[] modifiedProperties = monitor.getModifiedProperties();
email = serviceContext.getEmailService().saveEmail(email, attachments, clientCode, currentUser, modifiedProperties);
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -37,9 +37,8 @@
}
@Override
- public void doAction() throws Exception {
- super.doAction();
+ public void postSuccessAction() {
+ super.postSuccessAction();
getActionEngine().runInternalAction(getContext().getMainUI().getHandler(), GoToPreviousScreenAction.class);
}
-
}
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -90,7 +90,11 @@
public void postSuccessAction() {
super.postSuccessAction();
MailFolderChooserUIHandler handler = getHandler();
- getActionEngine().runInternalAction(handler, GoToPreviousScreenAction.class);
+ //FIXME works but ugly
+ FaxToMailUI parentDemandeListUI = (FaxToMailUI) getUI().getContextValue(JAXXContext.class, JAXXUtil.PARENT);
+ if (parentDemandeListUI != null && !DemandeListUI.class.isAssignableFrom(parentDemandeListUI.getClass())) {
+ getActionEngine().runInternalAction(handler, GoToPreviousScreenAction.class);
+ }
handler.closeFrame();
}
}
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -114,6 +114,7 @@
} else {
filename = FaxToMailUIUtil.getEditedFileName(attachment.getOriginalFileName());
}
+
FaxToMailServiceContext serviceContext = context.newServiceContext();
Email email = serviceContext.getEmailService().addToHistory(topiaId,
HistoryType.ATTACHMENT_OPENING,
@@ -127,6 +128,7 @@
@Override
public void onAttachmentEdited(Attachment attachment) {
String topiaId = model.getTopiaId();
+ //TODO kmorin 20140813 action
FaxToMailServiceContext serviceContext = context.newServiceContext();
Email email = serviceContext.getEmailService().addToHistory(topiaId,
HistoryType.ATTACHMENT_MODIFICATION,
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -159,6 +159,7 @@
if (file != null) {
try {
// warning, this not NOT be closed (will be by blob on commit)
+ //TODO kmorin 20140813 action ?
InputStream is = new FileInputStream(file);
FaxToMailServiceContext serviceContext = getContext().newServiceContext();
AttachmentFile attachmentFile = serviceContext.getEmailService().getAttachmentFileFromStream(is);
@@ -188,11 +189,11 @@
if (model.isEditable() && FaxToMailUIUtil.isFileTypeEditable(attachment.getOriginalFileName())) {
editAttachmentAction.setAttachment(attachment);
- getContext().getActionFactory().createUIAction(null, editAttachmentAction).actionPerformed(null);
+ getContext().getActionEngine().runAction(editAttachmentAction);
} else if (attachment.getEditedFileName() != null) {
openAttachmentAction.setAttachment(attachment, false);
- getContext().getActionFactory().createUIAction(null, openAttachmentAction).actionPerformed(null);
+ getContext().getActionEngine().runAction(openAttachmentAction);
}
}
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -558,6 +558,7 @@
for (Attachment attachment : demandeUIModel.getAttachment()) {
// force lazy loading
+ // TODO kmorin 20140813 action ?
FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment);
AttachmentFile attachmentFile = attachment.getEditedFile();
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -195,7 +195,7 @@
// init range model
final RangeTableModel rangeTableModel = new RangeTableModel(columnModel);
- List<RangeRowModel> rangeRowModels = model.getValidRangeRowModels();
+ List<RangeRowModel> rangeRowModels = new ArrayList<RangeRowModel>(model.getValidRangeRowModels());
// Collection<RangeRow> rangeRows = model.getRangeRow();
// if (rangeRows != null) {
@@ -433,6 +433,8 @@
if (log.isDebugEnabled()) {
log.debug("closing: " + ui);
}
+ FaxToMailServiceContext serviceContext = getContext().newServiceContext();
+ serviceContext.getEmailService().unlockEmail(getModel().getTopiaId());
clearValidators();
}
@@ -454,12 +456,6 @@
getContext().getActionFactory().createLogicAction(this, SaveDemandeAction.class)
);
- // mettre ca ici et non dans le close, car pour un onglet, le close n'est pas appelé
- if (result) {
- FaxToMailServiceContext serviceContext = getContext().newServiceContext();
- serviceContext.getEmailService().unlockEmail(getModel().getTopiaId());
- }
-
return result;
}
@@ -520,6 +516,7 @@
@Override
public boolean onHideTab(int currentIndex, int newIndex) {
closeButtonPopups();
+ onCloseUI();
return true;
}
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -688,9 +688,9 @@
}
public void setRangeRow(List<RangeRow> rangeRow) {
- Object oldValue = null;
+ ArrayList<RangeRow> oldValue = new ArrayList<RangeRow>();
if (getRangeRow() != null) {
- oldValue = new ArrayList<RangeRow>(getRangeRow());
+ oldValue.addAll(getRangeRow());
}
if (rangeRow == null) {
rangeRow = new ArrayList<RangeRow>();
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -37,7 +37,7 @@
import javax.swing.JComponent;
import javax.swing.JTabbedPane;
-import jaxx.runtime.JAXXContext;
+import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeAction;
import jaxx.runtime.JAXXUtil;
import jaxx.runtime.validator.swing.SwingValidator;
@@ -53,14 +53,12 @@
import org.nuiton.jaxx.application.swing.util.CloseableUI;
import com.franciaflex.faxtomail.persistence.entities.Configuration;
-import com.franciaflex.faxtomail.persistence.entities.DemandStatus;
import com.franciaflex.faxtomail.persistence.entities.Email;
import com.franciaflex.faxtomail.persistence.entities.EtatAttente;
import com.franciaflex.faxtomail.persistence.entities.MailAction;
import com.franciaflex.faxtomail.persistence.entities.MailFolder;
import com.franciaflex.faxtomail.services.FaxToMailServiceUtils;
import com.franciaflex.faxtomail.ui.swing.actions.ArchiveAction;
-import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenDialogAction;
import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeAndExitAction;
import com.franciaflex.faxtomail.ui.swing.content.print.AttachmentToPrintChooserUI;
import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI;
@@ -80,10 +78,10 @@
protected DelegateTabContainerHandler delegateTabHandler;
protected Configuration config;
+ protected SaveDemandeAction saveDemandeAction;
@Override
public void beforeInit(DemandesUI ui) {
-
super.beforeInit(ui);
DemandeUIModel currentEmail = getContext().getCurrentEmail();
@@ -312,6 +310,8 @@
handler = getTabHandler(newIndex);
if (handler != null) {
handler.onShowTab(currentIndex, newIndex);
+ saveDemandeAction = getContext().getActionFactory().createLogicAction((AbstractApplicationUIHandler) handler,
+ SaveDemandeAction.class);
}
}
if (change) {
@@ -337,38 +337,31 @@
public void transmitDemande() {
closeButtonPopups();
+ saveCurrentDemande(true);
+
DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent();
List<DemandeUIModel> demandes = Collections.singletonList(demandeUI.getModel());
+
MailFolderChooserUIModel model = new MailFolderChooserUIModel();
model.setDemandeUIModels(demandes);
MailFolderChooserUI dialogContent = new MailFolderChooserUI(ui, model);
-
- SaveAndOpenDialogAction action = new SaveAndOpenDialogAction(demandeUI.getHandler(),
- dialogContent,
- t("faxtomail.chooseMailFolder.title"),
- new Dimension(350, 500),
- true);
- getContext().getActionEngine().runAction(action);
+ openModalFrame(dialogContent, t("faxtomail.chooseMailFolder.title"), new Dimension(350, 500));
}
public void print() {
closeButtonPopups();
- DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent();
- AttachmentToPrintChooserUI dialogContent = new AttachmentToPrintChooserUI(ui, demandeUI.getModel());
-
MailFolder selectedFolder = getModel().getCurrentDemand().getMailFolder();
while (selectedFolder.getParent() != null && selectedFolder.getPrintActionEqualTakeAction() == null) {
selectedFolder = selectedFolder.getParent();
}
boolean take = Boolean.TRUE.equals(selectedFolder.getPrintActionEqualTakeAction());
+ saveCurrentDemande(take);
- SaveAndOpenDialogAction action = new SaveAndOpenDialogAction(demandeUI.getHandler(),
- dialogContent,
- t("faxtomail.chooseAttachmentToPrint.title"),
- new Dimension(350, 500),
- take);
- getContext().getActionEngine().runAction(action);
+ DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent();
+ AttachmentToPrintChooserUI dialogContent = new AttachmentToPrintChooserUI(ui, demandeUI.getModel());
+
+ openModalFrame(dialogContent, t("faxtomail.chooseAttachmentToPrint.title"), new Dimension(350, 500));
}
public void archive() {
@@ -381,6 +374,8 @@
public void reply() {
closeButtonPopups();
+ saveCurrentDemande(true);
+
ReplyFormUI dialogContent = new ReplyFormUI(ui);
ReplyFormUIModel model = dialogContent.getModel();
DemandeUIModel currentDemand = getModel().getCurrentDemand();
@@ -394,26 +389,24 @@
}
model.setTo(sender);
- DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent();
- SaveAndOpenDialogAction action = new SaveAndOpenDialogAction(demandeUI.getHandler(),
- dialogContent,
- t("faxtomail.reply.title", currentDemand.getTitle()),
- new Dimension(800, 600),
- true);
- getContext().getActionEngine().runAction(action);
+ openModalFrame(dialogContent, t("faxtomail.reply.title", currentDemand.getTitle()), new Dimension(800, 600));
}
public void group() {
closeButtonPopups();
+ saveCurrentDemande(false);
+
SearchToGroupUI dialogContent = new SearchToGroupUI(ui);
DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent();
- SaveAndOpenDialogAction action = new SaveAndOpenDialogAction(demandeUI.getHandler(),
- dialogContent,
- t("faxtomail.searchToGroup.title", demandeUI.getModel().getTitle()),
- getContext().getMainUI().getSize(),
- false);
- getContext().getActionEngine().runAction(action);
+ openModalFrame(dialogContent,
+ t("faxtomail.searchToGroup.title", demandeUI.getModel().getTitle()),
+ getContext().getMainUI().getSize());
}
+ protected void saveCurrentDemande(boolean takeIfNotTaken) {
+ saveDemandeAction.setTakeIfNotTaken(takeIfNotTaken);
+ getContext().getActionEngine().runActionAndWait(saveDemandeAction);
+ }
+
}
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -65,6 +65,7 @@
DemandeUIModel demand = model.getDemand();
// add demand details
+ //TODO kmorin 20140813 action ?
FaxToMailServiceContext serviceContext = getContext().newServiceContext();
EmailService emailService = serviceContext.getEmailService();
Email email = getModel().getDemand().toEntity();
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -29,6 +29,8 @@
import com.franciaflex.faxtomail.persistence.entities.AttachmentFileImpl;
import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl;
import com.franciaflex.faxtomail.services.service.EmailService;
+import com.franciaflex.faxtomail.ui.swing.actions.AddAttachmentToReplyAction;
+import com.franciaflex.faxtomail.ui.swing.actions.OpenAttachmentAction;
import com.google.common.base.Strings;
import org.apache.commons.io.FileUtils;
@@ -90,12 +92,17 @@
private static final Log log = LogFactory.getLog(ReplyFormUIHandler.class);
+ protected AddAttachmentToReplyAction addAttachmentToReplyAction;
+
@Override
public void beforeInit(ReplyFormUI ui) {
-
super.beforeInit(ui);
+ addAttachmentToReplyAction =
+ getContext().getActionFactory().createLogicAction(this, AddAttachmentToReplyAction.class);
+
ReplyFormUIModel model = new ReplyFormUIModel();
+ //TODO kmorin 20140813 action ?
long maxSize = getContext().newServiceContext().getConfigurationService().getEmailMaxSize();
model.setMaxAttachmentLength(maxSize);
@@ -240,21 +247,9 @@
if (ReplyAttachmentModel.class.isAssignableFrom(selectedItem.getClass())) {
replyAttachmentModel = (ReplyAttachmentModel) selectedItem;
+ addAttachmentToReplyAction.setReplyAttachmentModel(replyAttachmentModel);
+ getContext().getActionEngine().runActionAndWait(addAttachmentToReplyAction);
- Attachment attachment = replyAttachmentModel.getAttachment();
- if (replyAttachmentModel.getAttachmentFile() == null && attachment.isPersisted()) {
- // TODO action ?
- EmailService service = getContext().newServiceContext().getEmailService();
- boolean original = replyAttachmentModel.isOriginal();
- AttachmentFile file = service.getAttachmentFile(attachment.getTopiaId(),
- original);
- if (original) {
- attachment.setOriginalFile(file);
- } else {
- attachment.setEditedFile(file);
- }
- }
-
} else if (File.class.isAssignableFrom(selectedItem.getClass())) {
File file = (File) selectedItem;
@@ -323,7 +318,7 @@
}
public void openAttachment(ReplyAttachmentModel attachment) {
-
+//TODO kmorin 20140813 action ?
FaxToMailUIUtil.openFile(getContext(), attachment.getAttachmentFile());
}
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -65,22 +65,18 @@
MailFolderChooserUIModel model = getModel();
- // fixme echatellier 20140808 : pour le dossier courant, on prend celui du premier mai
+ // fixme echatellier 20140808 : pour le dossier courant, on prend celui du premier mais
// ce n'est pas forcement très correct pour la recherche car les demandes peuvent
// provenir de dossier différents
MailFolder currentMailFolder = model.getDemandeUIModels().get(0).getMailFolder();
- // on recupere seulement les dossiers qui accepte l'ensemble des états d'attentes
- // et des types de demande de l'ensemble des demandes
+ // on recupere seulement les dossiers qui accepte l'ensemble des états d'attentes de l'ensemble des demandes
Set<EtatAttente> allEtatsAttentes = new HashSet<EtatAttente>();
Set<DemandType> allDemandTypes = new HashSet<DemandType>();
for (DemandeUIModel demande : model.getDemandeUIModels()) {
if (demande.getEtatAttente() != null) {
allEtatsAttentes.add(demande.getEtatAttente());
}
- if (demande.getDemandType() != null) {
- allDemandTypes.add(demande.getDemandType());
- }
}
FaxToMailServiceContext serviceContext = getContext().newServiceContext();
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-08-13 15:54:28 UTC (rev 550)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-08-13 15:56:39 UTC (rev 551)
@@ -268,7 +268,7 @@
/**
* Open frame and disable parent frame
*/
- public void openModalFrame(final ApplicationUI dialogContent, String title, Dimension dim) {
+ public JFrame openModalFrame(final ApplicationUI dialogContent, String title, Dimension dim) {
JFrame result = getContext().getSecondaryFrame();
if (result == null) {
result = new JFrame();
@@ -278,6 +278,7 @@
final JFrame parentContainer = getParentContainer(JFrame.class);
parentContainer.setEnabled(false);
+ parentContainer.setFocusableWindowState(false);
result.setTitle(title);
result.setContentPane((Container) dialogContent);
@@ -315,6 +316,7 @@
@Override
public void windowClosed(WindowEvent e) {
parentContainer.setEnabled(true);
+ parentContainer.setFocusableWindowState(true);
Component ui = (Component) e.getSource();
if (log.isDebugEnabled()) {
@@ -327,6 +329,8 @@
result.setSize(dim);
SwingUtil.center(parentContainer, result);
result.setVisible(true);
+
+ return result;
}
/**
1
0
r550 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search
by echatellier@users.forge.codelutin.com 13 Aug '14
by echatellier@users.forge.codelutin.com 13 Aug '14
13 Aug '14
Author: echatellier
Date: 2014-08-13 17:54:28 +0200 (Wed, 13 Aug 2014)
New Revision: 550
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/550
Log:
Remove non correct message
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/SearchUIHandler.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-08-13 15:38:26 UTC (rev 549)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-08-13 15:54:28 UTC (rev 550)
@@ -171,7 +171,6 @@
List<DemandeUIModel> emails = (List<DemandeUIModel>) evt.getNewValue();
AbstractApplicationTableModel<DemandeUIModel> dataTableModel = (AbstractApplicationTableModel<DemandeUIModel>) dataTable.getModel();
dataTableModel.setRows(emails);
- showInformationMessage(t("faxtomail.search.resultNb", emails.size()));
DemandeUIModel currentEmail = getContext().getCurrentEmail();
if (currentEmail != null) {
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-08-13 15:38:26 UTC (rev 549)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-08-13 15:54:28 UTC (rev 550)
@@ -158,7 +158,6 @@
List<DemandeUIModel> emails = (List<DemandeUIModel>) evt.getNewValue();
AbstractApplicationTableModel<DemandeUIModel> dataTableModel = (AbstractApplicationTableModel<DemandeUIModel>) dataTable.getModel();
dataTableModel.setRows(emails);
- showInformationMessage(t("faxtomail.search.resultNb", emails.size()));
DemandeUIModel currentEmail = getContext().getCurrentEmail();
if (currentEmail != null) {
1
0
r549 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply
by echatellier@users.forge.codelutin.com 13 Aug '14
by echatellier@users.forge.codelutin.com 13 Aug '14
13 Aug '14
Author: echatellier
Date: 2014-08-13 17:38:26 +0200 (Wed, 13 Aug 2014)
New Revision: 549
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/549
Log:
Disable add button when there is no selected attachement
Modified:
trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css
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-08-13 14:26:02 UTC (rev 548)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css 2014-08-13 15:38:26 UTC (rev 549)
@@ -113,6 +113,7 @@
#addAttachmentButton {
actionIcon: "add";
+ enabled: { addAttachmentFile.getSelectedItem() != null };
}
#buttonPanelLayout {
1
0
r548 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions
by echatellier@users.forge.codelutin.com 13 Aug '14
by echatellier@users.forge.codelutin.com 13 Aug '14
13 Aug '14
Author: echatellier
Date: 2014-08-13 16:26:02 +0200 (Wed, 13 Aug 2014)
New Revision: 548
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/548
Log:
Fix lazy exception on attachment when saving email
Modified:
trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java
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-08-13 13:59:23 UTC (rev 547)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java 2014-08-13 14:26:02 UTC (rev 548)
@@ -60,7 +60,7 @@
for (DemandeUIModel model : getModel().getSelectedEmails()) {
String topiaId = model.getTopiaId();
- Email persistedEmail = emailService.getEmailById(topiaId);
+ Email persistedEmail = emailService.getFullEmailById(topiaId);
FaxToMailUser currentUser = context.getCurrentUser();
Email email = model.toEntity(persistedEmail);
1
0