Author: echatellier Date: 2014-07-31 16:19:39 +0200 (Thu, 31 Jul 2014) New Revision: 454 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/454 Log: Load users only once 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-07-31 13:07:07 UTC (rev 453) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-07-31 14:19:39 UTC (rev 454) @@ -26,6 +26,7 @@ import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.EmailFilter; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.services.service.ReferentielService; import com.franciaflex.faxtomail.ui.swing.actions.GroupAction; @@ -109,24 +110,25 @@ ReferentielService referentielService = getContext().getReferentielService(); + List<FaxToMailUser> users = getContext().getUserService().getAllUsers(); SearchUIModel model = getModel(); initBeanFilterableComboBox(ui.getTakenByComboBox(), - getContext().getUserService().getAllUsers(), + users, model.getTakenBy()); initBeanFilterableComboBox(ui.getModifiedByComboBox(), - getContext().getUserService().getAllUsers(), + users, model.getModifiedBy()); initBeanFilterableComboBox(ui.getArchivedByComboBox(), - getContext().getUserService().getAllUsers(), + users, model.getArchivedBy()); initBeanFilterableComboBox(ui.getTransferByComboBox(), - getContext().getUserService().getAllUsers(), + users, model.getTransferBy()); initBeanFilterableComboBox(ui.getPrintedByComboBox(), - getContext().getUserService().getAllUsers(), + users, model.getPrintingBy()); initBeanFilterableComboBox(ui.getRepliedByComboBox(), - getContext().getUserService().getAllUsers(), + users, model.getReplyBy()); initCheckBoxComboBox(ui.getDocTypeComboBox(), 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-07-31 13:07:07 UTC (rev 453) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-07-31 14:19:39 UTC (rev 454) @@ -22,8 +22,29 @@ * #L% */ +import static org.nuiton.i18n.I18n.t; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import javax.swing.JComponent; +import javax.swing.ListSelectionModel; + +import jaxx.runtime.validator.swing.SwingValidator; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTable; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; + import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.EmailFilter; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.services.service.ReferentielService; import com.franciaflex.faxtomail.ui.swing.actions.SearchAction; @@ -33,24 +54,6 @@ import com.franciaflex.faxtomail.ui.swing.util.CloseableUI; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; -import jaxx.runtime.validator.swing.SwingValidator; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXTable; -import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; - -import javax.swing.*; - -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import static org.nuiton.i18n.I18n.t; - /** * Handler of UI {@link SearchUIHandler}. * @@ -93,26 +96,29 @@ initUI(ui); + long before = System.currentTimeMillis(); final ReferentielService referentielService = getContext().getReferentielService(); + // this loading take 1,5 seconds + List<FaxToMailUser> users = getContext().getUserService().getAllUsers(); SearchUIModel model = getModel(); initBeanFilterableComboBox(ui.getTakenByComboBox(), - getContext().getUserService().getAllUsers(), + users, model.getTakenBy()); initBeanFilterableComboBox(ui.getModifiedByComboBox(), - getContext().getUserService().getAllUsers(), + users, model.getModifiedBy()); initBeanFilterableComboBox(ui.getArchivedByComboBox(), - getContext().getUserService().getAllUsers(), + users, model.getArchivedBy()); initBeanFilterableComboBox(ui.getTransferByComboBox(), - getContext().getUserService().getAllUsers(), + users, model.getTransferBy()); initBeanFilterableComboBox(ui.getPrintedByComboBox(), - getContext().getUserService().getAllUsers(), + users, model.getPrintingBy()); initBeanFilterableComboBox(ui.getRepliedByComboBox(), - getContext().getUserService().getAllUsers(), + users, model.getReplyBy()); initCheckBoxComboBox(ui.getDocTypeComboBox(), @@ -163,7 +169,7 @@ } } }); - + if (getContext().getSearch() != null) { try { SearchAction searchAction = getContext().getActionFactory().createLogicAction(this, SearchAction.class); @@ -176,7 +182,8 @@ getContext().getErrorHelper().showErrorDialog(t("faxtomail.search.action.error")); } } - + long after = System.currentTimeMillis(); + System.out.println("Time = " + (after - before) + " ms"); } public void searchDemandes() {