Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java @ 3617:05deafdcbf39
sloppy logo placement property implementation.
flys-artifacts/trunk@5284 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Tue, 28 Aug 2012 15:53:05 +0000 |
parents | f84854eba0b3 |
children | b7867c03760a |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java Tue Aug 28 13:21:38 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java Tue Aug 28 15:53:05 2012 +0000 @@ -752,8 +752,8 @@ chartSection.setTitle(getChartTitle()); chartSection.setSubtitle(getChartSubtitle()); chartSection.setDisplayGrid(isGridVisible()); - // TODO default to: "none" chartSection.setDisplayLogo(showLogo()); + chartSection.setLogoPlacement(logoPlace()); return chartSection; } @@ -1030,6 +1030,18 @@ } + protected String logoPlace() { + ChartSettings chartSettings = getChartSettings(); + if (chartSettings != null) { + ChartSection cs = chartSettings.getChartSection(); + String place = cs.getLogoPlacement(); + + return place; + } + return "none"; + } + + /** Return the logo id from settings. */ protected String showLogo(ChartSettings chartSettings) { if (chartSettings != null) { @@ -1038,8 +1050,7 @@ return logo; } - // TODO "none" instead of null? - return null; + return "none"; }