dive4elements/river: artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java comparison

Code simplification + moved code out of inner loop.

author	Sascha L. Teichmann <teichmann@intevation.de>
date	Fri, 04 Oct 2013 18:33:44 +0200
parents	737dd43e32d6
children	60a5fc522ec4

comparison

equal deleted inserted replaced

-:737dd43e32d6
+:965dbf2d4c44
 }
 FacetFilter facetFilter =
 (FacetFilter)RiverContextFactory.getGlobalContext()
 .get(RiverContext.FACETFILTER_KEY);
-if (facetFilter == null) {
-return false;
+return facetFilter != null;
-}
-return true;
 }
 /** If a global facet filter and a bounded out are defined
 *  use them to eliminate unwished facets.
 */
 *
 * @param list List of outputs
 * @param fs List of facets
 */
 protected List<Output> generateOutputs(List<Output> list, List<Facet> fs) {
+boolean debug = log.isDebugEnabled();
 List<Output> generated = new ArrayList<Output>();
-log.debug("generateOutputs for Artifact " + getName() + " "
+if (debug) {
+log.debug("generateOutputs for Artifact " + getName() + " "
 + identifier());
+}
-boolean debug = log.isDebugEnabled();
+boolean useFacetFilter = usesOutputFacetFilter();
 for (Output out: list) {
-log.debug("check facets for output: " + out.getName());
+if (debug) {
+log.debug("check facets for output: " + out.getName());
+}
 String outName = out.getName();
 Output o = new DefaultOutput(
 outName,
 out.getDescription(),
 out.getMimeType(),
 String type = f.getName();
 /* Match the facets to the output configuration.
 * This is only done when we are not using the Output
 * we are bound to to determine the compatible facets. */
-if (outTypes.contains(type) || usesOutputFacetFilter()) {
+if (useFacetFilter || outTypes.contains(type)) {
 if (debug) {
 log.debug("Add facet " + f);
 }
 facetAdded = true;
 o.addFacet(f);

Mercurial > dive4elements > river