comparison artifacts/src/main/java/org/dive4elements/river/jfree/StyledXYSeries.java @ 8287:4c1f57839ae9

Avoid NPE if river is not accessible.
author "Tom Gottfried <tom@intevation.de>"
date Wed, 17 Sep 2014 13:00:14 +0200
parents e4606eae8ea5
children d4c501d2c098
comparison
equal deleted inserted replaced
8286:62b4f3ca99ed 8287:4c1f57839ae9
10 10
11 import java.util.List; 11 import java.util.List;
12 import java.util.Map; 12 import java.util.Map;
13 13
14 import org.apache.log4j.Logger; 14 import org.apache.log4j.Logger;
15
16 import org.dive4elements.river.model.River;
17
15 import org.dive4elements.artifacts.Artifact; 18 import org.dive4elements.artifacts.Artifact;
16 import org.dive4elements.artifacts.CallContext; 19 import org.dive4elements.artifacts.CallContext;
17 import org.dive4elements.river.artifacts.D4EArtifact; 20 import org.dive4elements.river.artifacts.D4EArtifact;
18 import org.dive4elements.river.artifacts.access.RiverAccess; 21 import org.dive4elements.river.artifacts.access.RiverAccess;
19 import org.dive4elements.river.artifacts.resources.Resources; 22 import org.dive4elements.river.artifacts.resources.Resources;
20 import org.dive4elements.river.model.Unit; 23 import org.dive4elements.river.model.Unit;
21 import org.dive4elements.river.themes.ThemeDocument; 24 import org.dive4elements.river.themes.ThemeDocument;
22 import org.dive4elements.river.utils.RiverUtils;
23 25
24 import org.jfree.data.xy.XYDataItem; 26 import org.jfree.data.xy.XYDataItem;
25 import org.jfree.data.xy.XYSeries; 27 import org.jfree.data.xy.XYSeries;
26 28
27 import java.awt.Shape; 29 import java.awt.Shape;
138 @Override 140 @Override
139 public void putMetaData(Map<String, String> metaData, 141 public void putMetaData(Map<String, String> metaData,
140 Artifact artifact, 142 Artifact artifact,
141 CallContext context) { 143 CallContext context) {
142 this.metaData = metaData; 144 this.metaData = metaData;
143 D4EArtifact d4e = (D4EArtifact) artifact; 145 River river = new RiverAccess((D4EArtifact)artifact).getRiver();
144 RiverAccess access = new RiverAccess(d4e); 146 String rivername = "";
145 Unit unit = RiverUtils.getRiver(d4e).getWstUnit(); 147 String unit = "";
148 if (river != null) {
149 rivername = river.getName();
150 unit = river.getWstUnit().getName();
151 }
146 if (metaData.containsKey("X")) { 152 if (metaData.containsKey("X")) {
147 this.metaData.put("X", 153 this.metaData.put("X",
148 Resources.getMsg( 154 Resources.getMsg(
149 context.getMeta(), 155 context.getMeta(),
150 metaData.get("X"), 156 metaData.get("X"),
151 new Object[] { access.getRiverName() })); 157 new Object[] { rivername }));
152 } 158 }
153 if (metaData.containsKey("Y")) { 159 if (metaData.containsKey("Y")) {
154 this.metaData.put("Y", 160 this.metaData.put("Y",
155 Resources.getMsg( 161 Resources.getMsg(
156 context.getMeta(), 162 context.getMeta(),
157 metaData.get("Y"), new Object[] { unit.getName() })); 163 metaData.get("Y"), new Object[] { unit }));
158 } 164 }
159 } 165 }
160 } 166 }
161 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : 167 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

http://dive4elements.wald.intevation.org