comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java @ 4497:a2735a4bf75e

Change facets member variable to private Don't allow direct access to the facets member variable. Use the addFacets and getFacets methods instead.
author Björn Ricks <bjoern.ricks@intevation.de>
date Wed, 14 Nov 2012 11:15:57 +0100
parents e47559908acc
children
comparison
equal deleted inserted replaced
4496:d8992459b408 4497:a2735a4bf75e
104 DefaultState state = (DefaultState) getCurrentState(context); 104 DefaultState state = (DefaultState) getCurrentState(context);
105 state.computeInit(this, hash(), context, meta, fs); 105 state.computeInit(this, hash(), context, meta, fs);
106 106
107 if (!fs.isEmpty()) { 107 if (!fs.isEmpty()) {
108 logger.debug("Facets to add in AnnotationsArtifact.initialize ."); 108 logger.debug("Facets to add in AnnotationsArtifact.initialize .");
109 facets.put(getCurrentStateId(), fs); 109 addFacets(getCurrentStateId(), fs);
110 } 110 }
111 else { 111 else {
112 logger.debug("No facets to add in AnnotationsArtifact.initialize ."); 112 logger.debug("No facets to add in AnnotationsArtifact.initialize .");
113 } 113 }
114 } 114 }
211 if (list == null || list.isEmpty()) { 211 if (list == null || list.isEmpty()) {
212 logger.debug("-> No output modes for this state."); 212 logger.debug("-> No output modes for this state.");
213 continue; 213 continue;
214 } 214 }
215 215
216 List<Facet> fs = facets.get(stateId); 216 List<Facet> fs = getFacets(stateId);
217 if (fs == null || fs.isEmpty()) { 217 if (fs == null || fs.isEmpty()) {
218 logger.debug("No facets found."); 218 logger.debug("No facets found.");
219 continue; 219 continue;
220 } 220 }
221 221
232 List<Output> list = cur.getOutputs(); 232 List<Output> list = cur.getOutputs();
233 if (list != null && list.size() > 0) { 233 if (list != null && list.size() > 0) {
234 logger.debug( 234 logger.debug(
235 "Append output modes for state: " + cur.getID()); 235 "Append output modes for state: " + cur.getID());
236 236
237 List<Facet> fs = facets.get(cur.getID()); 237 List<Facet> fs = getFacets(cur.getID());
238 if (fs != null && fs.size() > 0) { 238 if (fs != null && fs.size() > 0) {
239 List<Output> generated = generateOutputs(list, fs); 239 List<Output> generated = generateOutputs(list, fs);
240 240
241 logger.debug("Found " + fs.size() + " current facets."); 241 logger.debug("Found " + fs.size() + " current facets.");
242 if (!generated.isEmpty()) { 242 if (!generated.isEmpty()) {

http://dive4elements.wald.intevation.org