Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/GaugeTimerangeState.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
| author | gernotbelger |
|---|---|
| date | Fri, 19 Jan 2018 11:23:42 +0100 |
| parents | 5e38e2924c07 |
| children | 0a5239a1e46e |
comparison
equal
deleted
inserted
replaced
| 8854:7bbfb24e6eec | 8860:28df64078f27 |
|---|---|
| 61 | 61 |
| 62 Calendar lo = (Calendar) res[0]; | 62 Calendar lo = (Calendar) res[0]; |
| 63 Calendar up = (Calendar) res[1]; | 63 Calendar up = (Calendar) res[1]; |
| 64 | 64 |
| 65 if (lo != null && up != null) { | 65 if (lo != null && up != null) { |
| 66 return new long[] { lo.getTimeInMillis(), up.getTimeInMillis() }; | 66 return new long[] { lo.getTimeInMillis(), |
| 67 up.getTimeInMillis() }; | |
| 67 } | 68 } |
| 68 } | 69 } |
| 69 | 70 |
| 70 log.warn("Could not determine time range for gauge: " + gauge.getName() | 71 log.warn("Could not determine time range for gauge: " + gauge.getName() |
| 71 + " id: " + gauge.getId()); | 72 + " id: " + gauge.getId()); |