Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation6.java @ 2598:e96bf6c47c12
Improved selecting discharge tables for historical discharge calculation.
flys-artifacts/trunk@4169 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 20 Mar 2012 11:34:44 +0000 |
| parents | 899ca89f497e |
| children | 200e70f31f6f |
comparison
equal
deleted
inserted
replaced
| 2597:b61357384a7a | 2598:e96bf6c47c12 |
|---|---|
| 106 | 106 |
| 107 | 107 |
| 108 protected boolean isDischargeTableRelevant(DischargeTable dt) { | 108 protected boolean isDischargeTableRelevant(DischargeTable dt) { |
| 109 TimeInterval ti = dt.getTimeInterval(); | 109 TimeInterval ti = dt.getTimeInterval(); |
| 110 | 110 |
| 111 if (dt.getKind() == Gauge.MASTER_DISCHARGE_TABLE) { | 111 if (dt.getKind() == Gauge.MASTER_DISCHARGE_TABLE || ti == null) { |
| 112 return false; | 112 return false; |
| 113 } | 113 } |
| 114 | 114 |
| 115 Date start = ti.getStartTime(); | 115 Date start = ti.getStartTime(); |
| 116 long startTime = start.getTime(); | 116 long startTime = start.getTime(); |