Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java @ 1099:af73f196eccc
Refactored to use new FLYSUtils, moved getRiver-functionality inside.
flys-artifacts/trunk@2602 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Mon, 29 Aug 2011 09:01:40 +0000 |
parents | 3067e700fc13 |
children | 5b38cdf65307 |
comparison
equal
deleted
inserted
replaced
1098:1ea7eb72aaa6 | 1099:af73f196eccc |
---|---|
26 import de.intevation.artifactdatabase.data.StateData; | 26 import de.intevation.artifactdatabase.data.StateData; |
27 | 27 |
28 import de.intevation.artifacts.common.utils.XMLUtils; | 28 import de.intevation.artifacts.common.utils.XMLUtils; |
29 | 29 |
30 import de.intevation.flys.artifacts.states.DefaultState; | 30 import de.intevation.flys.artifacts.states.DefaultState; |
31 import de.intevation.flys.artifacts.cache.CacheFactory; | |
31 import de.intevation.flys.artifacts.context.FLYSContext; | 32 import de.intevation.flys.artifacts.context.FLYSContext; |
33 import de.intevation.flys.artifacts.model.AnnotationsFactory; | |
34 import de.intevation.flys.artifacts.model.RiverFactory; | |
32 | 35 |
33 import de.intevation.flys.backend.SessionHolder; | 36 import de.intevation.flys.backend.SessionHolder; |
34 | 37 |
35 import de.intevation.flys.artifacts.cache.CacheFactory; | |
36 | |
37 import de.intevation.flys.model.Annotation; | 38 import de.intevation.flys.model.Annotation; |
38 import de.intevation.flys.artifacts.model.AnnotationsFactory; | |
39 | |
40 import de.intevation.flys.model.River; | 39 import de.intevation.flys.model.River; |
41 | 40 |
42 import de.intevation.flys.artifacts.model.RiverFactory; | 41 import de.intevation.flys.utils.FLYSUtils; |
43 | 42 |
44 /** | 43 /** |
45 * Artifact to access names of Points Of Interest along a segment of a river. | 44 * Artifact to access names of Points Of Interest along a segment of a river. |
46 */ | 45 */ |
47 public class AnnotationArtifact extends StaticFLYSArtifact { | 46 public class AnnotationArtifact extends StaticFLYSArtifact { |
230 catch (IllegalArgumentException iae) { | 229 catch (IllegalArgumentException iae) { |
231 // state is not valid, so we do not append its outputs. | 230 // state is not valid, so we do not append its outputs. |
232 } | 231 } |
233 } | 232 } |
234 | 233 |
235 public River getRiver() { | |
236 StateData dRiver = getData("river"); | |
237 | |
238 return dRiver != null | |
239 ? RiverFactory.getRiver((String) dRiver.getValue()) | |
240 : null; | |
241 } | |
242 | 234 |
243 /** | 235 /** |
244 * Get Annotations for Points (opposed to segments) in river in range. | 236 * Get Annotations for Points (opposed to segments) in river in range. |
245 * | 237 * |
246 * @return list of Annotations. | 238 * @return list of Annotations. |
247 */ | 239 */ |
248 public List<Annotation> getAnnotations() { | 240 public List<Annotation> getAnnotations() { |
249 String river = getRiver().getName(); | 241 String river = FLYSUtils.getRiver(this).getName(); |
250 logger.debug("Search annotations for river: " /*+ river*/); | 242 logger.debug("Search annotations for river: " /*+ river*/); |
251 //Cache cache = CacheFactory.getCache(CACHE_NAME); | 243 //Cache cache = CacheFactory.getCache(CACHE_NAME); |
252 | 244 |
253 List<Annotation> annotations = new ArrayList<Annotation>(); | 245 List<Annotation> annotations = new ArrayList<Annotation>(); |
254 | 246 |