Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Major] Using DateRange in DateSelector

This commit is contained in:
Robert von Burg 2014-08-26 22:01:57 +02:00
parent 690dfc9fc1
commit d0740d1526
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/li/strolch/runtime/query/inmemory/DateSelector.java
View File

@ -15,27 +15,29 @@
*/
package li.strolch.runtime.query.inmemory;
import java.util.Date;
import li.strolch.model.Order;
import ch.eitchnet.utils.collections.DateRange;
/**
* @author Robert von Burg <eitch@eitchnet.ch>
*
*/
public class DateSelector implements Selector<Order> {
private Date date;
private DateRange dateRange;
public DateSelector(DateRange dateRange) {
this.dateRange = dateRange;
}
/**
* @param date
* @return the dateRange
*/
public DateSelector(Date date) {
this.date = date;
public DateRange getDateRange() {
return this.dateRange;
}
@Override
public boolean select(Order element) {
return this.date.equals(element.getDate());
return this.dateRange.contains(element.getDate());
}
}

2
src/main/java/li/strolch/runtime/query/inmemory/InMemoryOrderQueryVisitor.java
View File

@ -66,7 +66,7 @@ public class InMemoryOrderQueryVisitor extends InMemoryQueryVisitor<Order, Order
@Override
public void visit(DateSelection selection) {
addSelector(new DateSelector(selection.getDate()));
addSelector(new DateSelector(selection.getDateRange()));
}
@Override

1
src/main/java/li/strolch/runtime/query/inmemory/InMemoryQueryVisitor.java
View File

@ -39,7 +39,6 @@ import li.strolch.model.query.Selection;
import li.strolch.model.query.StrolchElementSelectionVisitor;
import li.strolch.persistence.api.StrolchDao;
import li.strolch.runtime.query.inmemory.ParameterSelector.StringParameterSelector;
import ch.eitchnet.utils.StringMatchMode;
import ch.eitchnet.utils.dbc.DBC;
/**