Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java @ 640:7e1a59fefa0d
Moved the code part that skips themes to a better place. This let us paint empty charts with no themes at all.
flys-artifacts/trunk@2021 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 27 May 2011 10:03:07 +0000 |
parents | deb5e9840813 |
children | ab9b6cae0d0d |
comparison
equal
deleted
inserted
replaced
639:deb5e9840813 | 640:7e1a59fefa0d |
---|---|
188 | 188 |
189 try { | 189 try { |
190 for (int i = 0; i < size; i++) { | 190 for (int i = 0; i < size; i++) { |
191 ManagedFacet theme = themeList.get(i); | 191 ManagedFacet theme = themeList.get(i); |
192 | 192 |
193 if (theme.getActive() == 0) { | |
194 continue; | |
195 } | |
196 | |
197 if (theme == null) { | 193 if (theme == null) { |
198 log.debug("Theme is empty - no output is generated."); | 194 log.debug("Theme is empty - no output is generated."); |
199 continue; | 195 continue; |
200 } | 196 } |
201 | 197 |
216 // TODO Remove the following two lines of code! The master | 212 // TODO Remove the following two lines of code! The master |
217 // artifact has to be determined correctly after | 213 // artifact has to be determined correctly after |
218 // OutGenerator.init is called! | 214 // OutGenerator.init is called! |
219 Artifact artifact = getArtifact(art, context); | 215 Artifact artifact = getArtifact(art, context); |
220 generator.setMasterArtifact(artifact); | 216 generator.setMasterArtifact(artifact); |
217 | |
218 if (theme.getActive() == 0) { | |
219 continue; | |
220 } | |
221 | 221 |
222 generator.doOut( | 222 generator.doOut( |
223 artifact, | 223 artifact, |
224 facetName, | 224 facetName, |
225 getFacetThemeFromAttribute( | 225 getFacetThemeFromAttribute( |