Author: kmorin Date: 2014-08-18 16:45:36 +0200 (Mon, 18 Aug 2014) New Revision: 573 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/573 Log: evite un fetch un peu lourd Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-18 14:34:20 UTC (rev 572) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-18 14:45:36 UTC (rev 573) @@ -573,8 +573,8 @@ Email.PROPERTY_CLIENT, Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, Email.PROPERTY_ETAT_ATTENTE, - Email.PROPERTY_ETAT_ATTENTE + "." + EtatAttente.PROPERTY_INVALID_FORM_DISABLED_ACTIONS, - Email.PROPERTY_ETAT_ATTENTE + "." + EtatAttente.PROPERTY_VALID_FORM_DISABLED_ACTIONS, +// Email.PROPERTY_ETAT_ATTENTE + "." + EtatAttente.PROPERTY_INVALID_FORM_DISABLED_ACTIONS, +// Email.PROPERTY_ETAT_ATTENTE + "." + EtatAttente.PROPERTY_VALID_FORM_DISABLED_ACTIONS, Email.PROPERTY_TAKEN_BY, Email.PROPERTY_REPLIES, Email.PROPERTY_ATTACHMENT, Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java 2014-08-18 14:34:20 UTC (rev 572) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java 2014-08-18 14:45:36 UTC (rev 573) @@ -89,7 +89,10 @@ @Override public List<EtatAttente> getAllEtatAttente() { EtatAttenteTopiaDao dao = getPersistenceContext().getEtatAttenteDao(); - return dao.findAll(); + return dao.forAll() + .addAllFetches(EtatAttente.PROPERTY_INVALID_FORM_DISABLED_ACTIONS, + EtatAttente.PROPERTY_VALID_FORM_DISABLED_ACTIONS) + .findAll(); } @Override Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-08-18 14:34:20 UTC (rev 572) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-08-18 14:45:36 UTC (rev 573) @@ -30,13 +30,17 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; +import java.util.Map; import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; +import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.MailField; +import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.pagination.PaginationResult; import com.franciaflex.faxtomail.persistence.entities.Email; @@ -108,6 +112,8 @@ log.debug(emails.size() + " emails in folder " + folder.getName()); } + Map<String, EtatAttente> etatAttenteById = Maps.uniqueIndex(getContext().getEtatAttenteCache(), TopiaEntities.getTopiaIdFunction()); + List<DemandeUIModel> demands = new ArrayList<DemandeUIModel>(); for (Email email : emails) { DemandeUIModel demand = new DemandeUIModel(); @@ -131,6 +137,10 @@ demand.setValid(handler.isDemandeValid(demand)); demand.setMailFolder(folder); demand.setEditable(folder.isFolderWritable()); + EtatAttente etatAttente = email.getEtatAttente(); + if (etatAttente != null) { + demand.setEtatAttente(etatAttenteById.get(etatAttente.getTopiaId())); + } demands.add(demand); }