Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java @ 3138:9c147bbffc36
FixA: Move Range out of FixingsOverview
flys-artifacts/trunk@4746 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Thu, 21 Jun 2012 15:18:46 +0000 |
parents | 0b86b005bb9a |
children | 3582e87e9171 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java Thu Jun 21 14:26:34 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java Thu Jun 21 15:18:46 2012 +0000 @@ -114,54 +114,6 @@ "WHERE" + " wst_column_id = :column_id"; - public static class Range implements Serializable { - - protected double start; - protected double end; - - public Range() { - } - - public Range(double start, double end) { - this.start = start; - this.end = end; - } - - public double getStart() { - return start; - } - - public double getEnd() { - return end; - } - - public boolean disjoint(Range other) { - return start > other.end || other.start > end; - } - - public boolean intersects(Range other) { - return !disjoint(other); - } - - public void extend(Range other) { - if (other.start < start) start = other.start; - if (other.end > end ) end = other.end; - } - - public boolean clip(Range other) { - if (disjoint(other)) return false; - - if (other.start > start) start = other.start; - if (other.end < end ) end = other.end; - - return true; - } - - public boolean inside(double x) { - return x > start-EPSILON && x < end+EPSILON; - } - } // class Range - public static class GaugeRange extends Range { private static final class Sector implements Serializable {