Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java @ 2332:0ddebd4448a7
Picked rev4038 from trunk to stop Annotations break chart rendering.
flys-artifacts/tags/2.6@4039 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Fri, 10 Feb 2012 16:42:41 +0000 |
| parents | 594885703687 |
| children | 2f6d4f92d628 |
comparison
equal
deleted
inserted
replaced
| 2331:2c96222dd773 | 2332:0ddebd4448a7 |
|---|---|
| 985 ArtifactAndFacet aandf, | 985 ArtifactAndFacet aandf, |
| 986 Document theme, | 986 Document theme, |
| 987 boolean visible | 987 boolean visible |
| 988 ){ | 988 ){ |
| 989 logger.debug("doAnnotations"); | 989 logger.debug("doAnnotations"); |
| 990 if (aandf == null) { | |
| 991 logger.warn( | |
| 992 "Facet for Annotations is null. " + | |
| 993 "This should never happen!"); | |
| 994 return; | |
| 995 } | |
| 996 | |
| 990 Facet facet = aandf.getFacet(); | 997 Facet facet = aandf.getFacet(); |
| 991 | 998 |
| 992 // Add all annotations to our annotation pool. | 999 // Add all annotations to our annotation pool. |
| 993 annotations.setTheme(theme); | 1000 annotations.setTheme(theme); |
| 994 if (facet != null) | 1001 if (facet != null) |