Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java @ 4846:298d540f7b70
WINFOArtifact: Use RangeAccess.getLocations instead of FLYSUtils.getLocations.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 23 Jan 2013 10:40:35 +0100 |
| parents | 65bfb6faa538 |
| children | aae2b7492c1e |
comparison
equal
deleted
inserted
replaced
| 4845:88f5ab736448 | 4846:298d540f7b70 |
|---|---|
| 9 import de.intevation.artifacts.CallContext; | 9 import de.intevation.artifacts.CallContext; |
| 10 | 10 |
| 11 import de.intevation.artifacts.common.utils.StringUtils; | 11 import de.intevation.artifacts.common.utils.StringUtils; |
| 12 | 12 |
| 13 import de.intevation.flys.artifacts.access.Calculation4Access; | 13 import de.intevation.flys.artifacts.access.Calculation4Access; |
| 14 import de.intevation.flys.artifacts.access.RangeAccess; | |
| 14 | 15 |
| 15 import de.intevation.flys.artifacts.geom.Lines; | 16 import de.intevation.flys.artifacts.geom.Lines; |
| 16 | 17 |
| 17 import de.intevation.flys.artifacts.model.Calculation1; | 18 import de.intevation.flys.artifacts.model.Calculation1; |
| 18 import de.intevation.flys.artifacts.model.Calculation2; | 19 import de.intevation.flys.artifacts.model.Calculation2; |
| 310 | 311 |
| 311 if (g == null) { | 312 if (g == null) { |
| 312 return error(null, "no.gauge.selected"); | 313 return error(null, "no.gauge.selected"); |
| 313 } | 314 } |
| 314 | 315 |
| 315 double[] locations = FLYSUtils.getLocations(this); | 316 RangeAccess rangeAccess = new RangeAccess(this, null); |
| 317 double[] locations = rangeAccess.getLocations(); | |
| 316 | 318 |
| 317 if (locations == null) { | 319 if (locations == null) { |
| 318 return error(null, "no.locations.selected"); | 320 return error(null, "no.locations.selected"); |
| 319 } | 321 } |
| 320 | 322 |
| 367 | 369 |
| 368 if (r == null) { | 370 if (r == null) { |
| 369 return error(new WQKms[0], "no.river.selected"); | 371 return error(new WQKms[0], "no.river.selected"); |
| 370 } | 372 } |
| 371 | 373 |
| 372 double[] locations = FLYSUtils.getLocations(this); | 374 RangeAccess rangeAccess = new RangeAccess(this, null); |
| 375 double[] locations = rangeAccess.getLocations(); | |
| 373 | 376 |
| 374 if (locations == null) { | 377 if (locations == null) { |
| 375 return error(new WQKms[0], "no.locations.selected"); | 378 return error(new WQKms[0], "no.locations.selected"); |
| 376 } | 379 } |
| 377 | 380 |