This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 4c48e9c9613a5c511fa897d9311a037a0a1ac8a4 Author: Kevin Morin <morin@codelutin.com> Date: Wed Jun 8 08:38:16 2016 +0200 fixes #8325 [Liste des demandes] On ne retourne pas à la page 1 quand on change de dossier --- .../ui/swing/content/demande/DemandeListUIHandler.java | 1 - .../faxtomail/ui/swing/content/demande/DemandeUIHandler.java | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java index 348605e..85bc56c 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java @@ -612,7 +612,6 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem protected void onDoubleClickOnDemande(DemandeUIModel selectedEmail) { super.onDoubleClickOnDemande(selectedEmail); selectedEmail.removePropertyChangeListener(selectedDemandeChangeListener); - getContext().setCurrentPaginationParameter(getModel().getPaginationParameter()); } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index 0ee690f..888cea2 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -347,12 +347,11 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, HighlightPredicate rowIsInvalidPredicate = new HighlightPredicate() { @Override public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - boolean result = false; AbstractApplicationTableModel model = (AbstractApplicationTableModel) table.getModel(); int viewRow = adapter.row; int modelRow = adapter.convertRowIndexToModel(viewRow); RangeRowModel row = (RangeRowModel) model.getEntry(modelRow); - result = !row.isValid(); + boolean result = !row.isValid(); return result; } }; @@ -434,10 +433,19 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, } } + Date now = new Date(); + if (log.isInfoEnabled()) { + log.info("avant chargement combo clients " + now); + } BeanFilterableComboBox<Client> clientComboBox = ui.getClientComboBox(); clientComboBox.getComboBoxModel().setWildcardCharacter(null); initBeanFilterableComboBox(clientComboBox, model.getAllowedClients(), model.getClient()); + long time = new Date().getTime()- now.getTime(); + if (log.isInfoEnabled()) { + log.info("chargement combo clients " + time); + } + listModelIsModify(model); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.