Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java @ 3230:b888c5eb65b3
Added new *Access objects for bed height calculation and flow velocity calculation; removed methods for specific data access from MINFOArtifact.
flys-artifacts/trunk@4859 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Tue, 03 Jul 2012 12:13:36 +0000 |
parents | d8444fcb4e44 |
children | cdbc457e23e2 |
comparison
equal
deleted
inserted
replaced
3229:ad9640211db3 | 3230:b888c5eb65b3 |
---|---|
8 import de.intevation.artifactdatabase.state.Facet; | 8 import de.intevation.artifactdatabase.state.Facet; |
9 | 9 |
10 import de.intevation.artifacts.CallContext; | 10 import de.intevation.artifacts.CallContext; |
11 | 11 |
12 import de.intevation.flys.artifacts.FLYSArtifact; | 12 import de.intevation.flys.artifacts.FLYSArtifact; |
13 import de.intevation.flys.artifacts.MINFOArtifact; | 13 import de.intevation.flys.artifacts.access.FlowVelocityAccess; |
14 import de.intevation.flys.artifacts.model.CalculationResult; | 14 import de.intevation.flys.artifacts.model.CalculationResult; |
15 import de.intevation.flys.artifacts.model.DataFacet; | 15 import de.intevation.flys.artifacts.model.DataFacet; |
16 import de.intevation.flys.artifacts.model.FacetTypes; | 16 import de.intevation.flys.artifacts.model.FacetTypes; |
17 import de.intevation.flys.artifacts.model.FlowVelocityCalculation; | 17 import de.intevation.flys.artifacts.model.FlowVelocityCalculation; |
18 import de.intevation.flys.artifacts.model.FlowVelocityData; | 18 import de.intevation.flys.artifacts.model.FlowVelocityData; |
44 Object old | 44 Object old |
45 ) { | 45 ) { |
46 logger.debug("FlowVelocityState.computeAdvance"); | 46 logger.debug("FlowVelocityState.computeAdvance"); |
47 | 47 |
48 List<Facet> newFacets = new ArrayList<Facet>(); | 48 List<Facet> newFacets = new ArrayList<Facet>(); |
49 | |
50 FlowVelocityAccess access = new FlowVelocityAccess(artifact); | |
49 | 51 |
50 CalculationResult res = old instanceof CalculationResult | 52 CalculationResult res = old instanceof CalculationResult |
51 ? (CalculationResult) old | 53 ? (CalculationResult) old |
52 : new FlowVelocityCalculation().calculate((MINFOArtifact) artifact); | 54 : new FlowVelocityCalculation().calculate(access); |
53 | 55 |
54 if (facets == null || res == null) { | 56 if (facets == null || res == null) { |
55 return res; | 57 return res; |
56 } | 58 } |
57 | 59 |