Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/collections/AttributeWriter.java @ 8856:5e38e2924c07 3.2.x
Fix code style.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Thu, 18 Jan 2018 20:12:01 +0100 |
| parents | 02782ed6c8de |
| children | 0a5239a1e46e |
comparison
equal
deleted
inserted
replaced
| 8855:d7c005e12af0 | 8856:5e38e2924c07 |
|---|---|
| 163 List<Facet> oldFacets, | 163 List<Facet> oldFacets, |
| 164 List<String> compatibleFacets) | 164 List<String> compatibleFacets) |
| 165 throws ArtifactDatabaseException | 165 throws ArtifactDatabaseException |
| 166 { | 166 { |
| 167 if (compatibleFacets == null) { | 167 if (compatibleFacets == null) { |
| 168 log.warn("No compatible facets, not generating out " + outputName + "."); | 168 log.warn("No compatible facets, not generating out " |
| 169 + outputName + "."); | |
| 169 return false; | 170 return false; |
| 170 } | 171 } |
| 171 | 172 |
| 172 int num = newFacets.size(); | 173 int num = newFacets.size(); |
| 173 | 174 |
| 206 if (facet.equals(picked)) { | 207 if (facet.equals(picked)) { |
| 207 if (!facetInTwoOuts(facet, genuinelyNewFacets)) { | 208 if (!facetInTwoOuts(facet, genuinelyNewFacets)) { |
| 208 genuinelyNewFacets.add(picked); | 209 genuinelyNewFacets.add(picked); |
| 209 } | 210 } |
| 210 else { | 211 else { |
| 211 log.debug("Skip clone facet that shall be present in two outs"); | 212 log.debug( |
| 213 "Skip clone facet that shall be present in two outs"); | |
| 212 } | 214 } |
| 213 } | 215 } |
| 214 else { | 216 else { |
| 215 currentFacets.add(picked); | 217 currentFacets.add(picked); |
| 216 } | 218 } |
| 251 } | 253 } |
| 252 } | 254 } |
| 253 currentFacets.add(newMF); | 255 currentFacets.add(newMF); |
| 254 } | 256 } |
| 255 | 257 |
| 256 // Fill/correct "gaps" (e.g. position 1,2,5 are taken, after gap filling | 258 // Fill "gaps" (e.g. position 1,2,5 are taken, after gap filling |
| 257 // expect positions 1,2,3 [5->3]) | 259 // expect positions 1,2,3 [5->3]) |
| 258 // Preparations to be able to detect gaps. | 260 // Preparations to be able to detect gaps. |
| 259 Map<Integer, ManagedFacet> mfmap = | 261 Map<Integer, ManagedFacet> mfmap = |
| 260 new HashMap<Integer, ManagedFacet>(); | 262 new HashMap<Integer, ManagedFacet>(); |
| 261 int maxPosition = 0; | 263 int maxPosition = 0; |
| 291 | 293 |
| 292 | 294 |
| 293 /** Returns true if a likely clone of facet is | 295 /** Returns true if a likely clone of facet is |
| 294 * contained in genuinelyNewFacets, as happens when same facet is defined | 296 * contained in genuinelyNewFacets, as happens when same facet is defined |
| 295 * for two outs. */ | 297 * for two outs. */ |
| 296 private boolean facetInTwoOuts(ManagedFacet facet, List<ManagedFacet> genuinelyNewFacets) { | 298 private boolean facetInTwoOuts( |
| 299 ManagedFacet facet, | |
| 300 List<ManagedFacet> genuinelyNewFacets | |
| 301 ) { | |
| 297 for (ManagedFacet otherFacet: genuinelyNewFacets) { | 302 for (ManagedFacet otherFacet: genuinelyNewFacets) { |
| 298 if (facet.isSame(otherFacet)) { | 303 if (facet.isSame(otherFacet)) { |
| 299 return true; | 304 return true; |
| 300 } | 305 } |
| 301 } | 306 } |