Mercurial > dive4elements > river
comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/DistancePanel.java @ 7731:91a57b66c7ed
Client side fix for flys/issue1549
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Mon, 20 Jan 2014 12:44:16 +0100 |
| parents | afa531aca3de |
| children | 1d6b957d8953 |
comparison
equal
deleted
inserted
replaced
| 7727:3d772f52080a | 7731:91a57b66c7ed |
|---|---|
| 596 Float from = event.getFrom() - 0.001f; | 596 Float from = event.getFrom() - 0.001f; |
| 597 Float to = event.getTo() + 0.001f; | 597 Float to = event.getTo() + 0.001f; |
| 598 | 598 |
| 599 Criterion combinedFilter = null; | 599 Criterion combinedFilter = null; |
| 600 Criterion locationFilter = null; | 600 Criterion locationFilter = null; |
| 601 | |
| 601 if (from.equals(Float.NaN) && to.equals(Float.NaN)) { | 602 if (from.equals(Float.NaN) && to.equals(Float.NaN)) { |
| 602 locationsTable.clearCriteria(); | 603 locationsTable.clearCriteria(); |
| 603 distancesTable.clearCriteria(); | 604 distancesTable.clearCriteria(); |
| 604 filterResultCount.setValue(""); | 605 filterResultCount.setValue(""); |
| 605 return; | 606 return; |
| 606 } | 607 } |
| 607 else if (from.equals(Float.NaN)) { | 608 |
| 608 combinedFilter = new Criterion("to", OperatorId.LESS_OR_EQUAL, to); | 609 if (from.equals(Float.NaN)) { |
| 610 combinedFilter = | |
| 611 new Criterion("to", OperatorId.LESS_OR_EQUAL, to); | |
| 612 | |
| 609 locationFilter = | 613 locationFilter = |
| 610 new Criterion("from", OperatorId.LESS_OR_EQUAL, to); | 614 new Criterion("from", OperatorId.LESS_OR_EQUAL, to); |
| 615 | |
| 611 locationsTable.filterData(locationFilter); | 616 locationsTable.filterData(locationFilter); |
| 612 distancesTable.filterData(combinedFilter); | 617 distancesTable.filterData(combinedFilter); |
| 613 filterResultCount.setValue(currentFiltered.getRecords().length); | 618 filterResultCount.setValue(currentFiltered.getRecords().length); |
| 614 return; | 619 return; |
| 615 } | 620 } |
| 616 else if (to.equals(Float.NaN)) { | 621 |
| 622 if (to.equals(Float.NaN)) { | |
| 617 combinedFilter = | 623 combinedFilter = |
| 618 new Criterion("from", OperatorId.GREATER_OR_EQUAL, from); | 624 new Criterion("from", OperatorId.GREATER_OR_EQUAL, from); |
| 619 } | 625 } |
| 620 else { | 626 else { |
| 621 AdvancedCriteria c1 = | 627 AdvancedCriteria c1 = |