Author: sletellier Date: 2011-05-25 15:51:42 +0200 (Wed, 25 May 2011) New Revision: 49 Url: http://chorem.org/repositories/revision/vradi/49 Log: [Search] Return same but filled FormPagedResult passed on param Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/SearchManager.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/SendingViewManager.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java 2011-05-24 23:38:12 UTC (rev 48) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java 2011-05-25 13:51:42 UTC (rev 49) @@ -92,6 +92,10 @@ this.nbFormsToShow = nbFormsToShow; } + public void setFormsToShow(List<Form> formsToShow) { + setFormsIdsToShow(extractIds(formsToShow)); + } + protected List<String> extractIds(List<Form> formsToShow) { List<String> formsIds = new ArrayList<String>(); if (formsToShow != null) { @@ -108,7 +112,7 @@ return formsIdsToShow; } - public void setFormsToShow(List<String> formsIdsToShow) { + public void setFormsIdsToShow(List<String> formsIdsToShow) { List<String> oldValue = this.formsIdsToShow; this.formsIdsToShow = formsIdsToShow; propertyChange.firePropertyChange(FORMS_TO_SHOW_PROPERTY, oldValue, formsIdsToShow); Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/SearchManager.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/SearchManager.java 2011-05-24 23:38:12 UTC (rev 48) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/SearchManager.java 2011-05-25 13:51:42 UTC (rev 49) @@ -26,7 +26,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.vradi.VradiServiceAction; import org.chorem.vradi.beans.FormPagedResult; import org.chorem.vradi.beans.QueryBean; import org.chorem.vradi.beans.QueryParameters; @@ -178,11 +177,10 @@ } List<Form> result = new ArrayList<Form>(queryResult.getAll()); - FormPagedResult formPageResult = new FormPagedResult(result, - queryResult.getNumFound(), formPagedResult.getPageToShow(), - formPagedResult.getNbFormsToShow()); + formPagedResult.setFormsToShow(result); + formPagedResult.setTotalFoundFormNb(queryResult.getNumFound()); - return formPageResult; + return formPagedResult; } public FormPagedResult findForms(QueryParameters queryParameters, FormPagedResult formPagedResult) Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/SendingViewManager.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/SendingViewManager.java 2011-05-24 23:38:12 UTC (rev 48) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/SendingViewManager.java 2011-05-25 13:51:42 UTC (rev 49) @@ -172,7 +172,7 @@ formsIdsToDisplay.addAll(deletedForms); } if (!formsIdsToDisplay.isEmpty()) { - formPage.setFormsToShow(new ArrayList<String>(formsIdsToDisplay)); + formPage.setFormsIdsToShow(new ArrayList<String>(formsIdsToDisplay)); } emailFormsHighlighter.setFormsAdded(addedForms);