comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java @ 3777:048a02e29808

Added base class RiverAccess to dense code to access the river name. flys-artifacts/trunk@5484 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Sun, 16 Sep 2012 18:42:20 +0000
parents 0f7abd95c6e2
children a4930c43b806
comparison
equal deleted inserted replaced
3776:1ddbf66a2b0a 3777:048a02e29808
1 package de.intevation.flys.artifacts.model; 1 package de.intevation.flys.artifacts.model;
2 2
3 import java.util.ArrayList; 3 import java.util.ArrayList;
4 import java.util.Collections;
4 import java.util.List; 5 import java.util.List;
5 6
6 import org.apache.log4j.Logger; 7 import de.intevation.artifacts.Artifact;
7 8
8 import de.intevation.artifacts.Artifact; 9 import de.intevation.flys.artifacts.access.FlowVelocityAccess;
10
11 import de.intevation.flys.artifacts.model.RiverFactory;
12
9 import de.intevation.flys.model.DischargeZone; 13 import de.intevation.flys.model.DischargeZone;
10 import de.intevation.flys.model.FlowVelocityModel; 14 import de.intevation.flys.model.FlowVelocityModel;
11 import de.intevation.flys.model.FlowVelocityModelValue; 15 import de.intevation.flys.model.FlowVelocityModelValue;
12 import de.intevation.flys.model.River; 16 import de.intevation.flys.model.River;
13 17
14 import de.intevation.flys.artifacts.access.FlowVelocityAccess; 18 import org.apache.log4j.Logger;
15 import de.intevation.flys.utils.FLYSUtils;
16 19
17 20
18 public class FlowVelocityCalculation extends Calculation { 21 public class FlowVelocityCalculation extends Calculation {
19 22
20 private static final Logger logger = 23 private static final Logger logger =
78 81
79 protected List<FlowVelocityModel> getFlowVelocityModels( 82 protected List<FlowVelocityModel> getFlowVelocityModels(
80 FlowVelocityAccess access, 83 FlowVelocityAccess access,
81 List<DischargeZone> zones 84 List<DischargeZone> zones
82 ) { 85 ) {
83 River river = FLYSUtils.getRiver(access.getArtifact()); 86 String riverName = access.getRiver();
87 if (riverName == null) {
88 logger.warn("No river name found");
89 return Collections.<FlowVelocityModel>emptyList();
90 }
91
92 River river = RiverFactory.getRiver(riverName);
93 if (river == null) {
94 logger.warn("No such river: " + riverName);
95 return Collections.<FlowVelocityModel>emptyList();
96 }
84 97
85 List<FlowVelocityModel> models = new ArrayList<FlowVelocityModel>(); 98 List<FlowVelocityModel> models = new ArrayList<FlowVelocityModel>();
86 99
87 for (DischargeZone zone: zones) { 100 for (DischargeZone zone: zones) {
88 List<FlowVelocityModel> model = 101 List<FlowVelocityModel> model =

http://dive4elements.wald.intevation.org