Author: bleny Date: 2011-07-21 10:32:18 +0000 (Thu, 21 Jul 2011) New Revision: 1382 Log: prevent infinite loop when user select two dates in anti-chronological order in filters Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java 2011-07-21 10:31:31 UTC (rev 1381) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java 2011-07-21 10:32:18 UTC (rev 1382) @@ -31,10 +31,12 @@ import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.ioc.annotations.Inject; +import org.nuiton.util.PeriodDates; import org.slf4j.Logger; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Date; /** * @author sletellier <letellier at codelutin.com> @@ -156,6 +158,17 @@ resetFilter(); } + // if user entered a non-chronological time interval, invert it + PeriodDates period = getFilter().getPeriod(); + if (period != null) { + Date fromDate = period.getFromDate(); + Date thruDate = period.getThruDate(); + if (thruDate.before(fromDate)) { + period.setFromDate(thruDate); + period.setThruDate(fromDate); + } + } + // Limite search panel updateSearchFields();