Mercurial > dive4elements > river
changeset 2434:e8b38b5e4cf9
Fixed Issue 498.
CollectionHelper returned 'null' element if no settings available. This
discarded theme attributes.
flys-client/trunk@4097 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Thu, 01 Mar 2012 12:00:06 +0000 |
| parents | 47a7bdfb4d37 |
| children | 114fea2de638 |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/server/CollectionHelper.java |
| diffstat | 2 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Thu Mar 01 09:47:55 2012 +0000 +++ b/flys-client/ChangeLog Thu Mar 01 12:00:06 2012 +0000 @@ -1,3 +1,11 @@ +2012-03-01 Raimund Renkert <raimund.renkert@intevation.de> + + Fixed Issue 498. + + * src/main/java/de/intevation/flys/client/server/CollectionHelper.java: + Do not return 'null' if no settings are available. Returning 'null' + discards theme attributes! + 2012-01-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> Fix flys/issue613 (points too big to play perfectly with other legend
--- a/flys-client/src/main/java/de/intevation/flys/client/server/CollectionHelper.java Thu Mar 01 09:47:55 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/CollectionHelper.java Thu Mar 01 12:00:06 2012 +0000 @@ -187,11 +187,12 @@ settings.getCategories().size() == 0) { logger.debug("No settings for output mode: " + mode.getName()); - return null; } - Element s = createSettingsElement(settingscr, collection, settings); - if (s != null) { - out.appendChild(s); + else { + Element s = createSettingsElement(settingscr, collection, settings); + if (s != null) { + out.appendChild(s); + } } logger.info(XMLUtils.toString(out)); return out;