Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/server/CollectionHelper.java @ 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 | c21d14e48040 |
| children | 5161e25392ea |
comparison
equal
deleted
inserted
replaced
| 2433:47a7bdfb4d37 | 2434:e8b38b5e4cf9 |
|---|---|
| 185 Settings settings = collection.getSettings(mode.getName()); | 185 Settings settings = collection.getSettings(mode.getName()); |
| 186 if (settings == null || | 186 if (settings == null || |
| 187 settings.getCategories().size() == 0) | 187 settings.getCategories().size() == 0) |
| 188 { | 188 { |
| 189 logger.debug("No settings for output mode: " + mode.getName()); | 189 logger.debug("No settings for output mode: " + mode.getName()); |
| 190 return null; | 190 } |
| 191 } | 191 else { |
| 192 Element s = createSettingsElement(settingscr, collection, settings); | 192 Element s = createSettingsElement(settingscr, collection, settings); |
| 193 if (s != null) { | 193 if (s != null) { |
| 194 out.appendChild(s); | 194 out.appendChild(s); |
| 195 } | |
| 195 } | 196 } |
| 196 logger.info(XMLUtils.toString(out)); | 197 logger.info(XMLUtils.toString(out)); |
| 197 return out; | 198 return out; |
| 198 } | 199 } |
| 199 | 200 |