Mercurial > dive4elements > river
diff gwt-client/src/main/java/org/dive4elements/river/client/shared/model/FixFilter.java @ 9099:850ce16034e9
2.3.4.1.10 Berechnung mit Start-km > End-km
author | gernotbelger |
---|---|
date | Mon, 28 May 2018 13:22:45 +0200 |
parents | 319aa972a1a3 |
children |
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/FixFilter.java Mon May 28 10:56:57 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/FixFilter.java Mon May 28 13:22:45 2018 +0200 @@ -11,7 +11,7 @@ import java.io.Serializable; /** Probably something like *Access, but from client side. */ -public class FixFilter implements Serializable{ +public class FixFilter implements Serializable { protected String river; protected double fromKm; @@ -37,41 +37,41 @@ this.events = new int[0]; } - public void setRiver(String river) { + public void setRiver(final String river) { this.river = river; } - public void setFromKm(double from) { + public void setFromKm(final double from) { this.fromKm = from; } - public void setToKm(double to) { + public void setToKm(final double to) { this.toKm = to; } - public void setCurrentKm(double km) { + public void setCurrentKm(final double km) { this.currentKm = km; } - public void setFromClass(int from) { + public void setFromClass(final int from) { this.fromClass = from; } - public void setToClass(int to) { + public void setToClass(final int to) { this.toClass = to; } - public void setFromDate(long from) { + public void setFromDate(final long from) { this.hasDate = true; this.fromDate = from; } - public void setToDate(long to) { + public void setToDate(final long to) { this.hasDate = true; this.toDate = to; } - public void setEvents(int[] ev) { + public void setEvents(final int[] ev) { this.events = ev; } @@ -79,14 +79,22 @@ return this.river; } - public double getFromKm() { - return this.fromKm; + public double getLowerKm() { + return Math.min(this.fromKm, this.toKm); } - public double getToKm() { - return this.toKm; + public double getUpperKm() { + return Math.max(this.fromKm, this.toKm); } + // public double getFromKm() { + // return this.fromKm; + // } + // + // public double getToKm() { + // return this.toKm; + // } + public double getCurrentKm() { return this.currentKm; } @@ -112,7 +120,7 @@ } public boolean hasDate() { - return fromDate != Long.MIN_VALUE && toDate != Long.MIN_VALUE; + return this.fromDate != Long.MIN_VALUE && this.toDate != Long.MIN_VALUE; } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :