[PATCH 3 of 4] Rename the Global Facet filter to reduce ambiguity with the old facet filter

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1385044663 -3600
# Node ID 60a5fc522ec426e6036f95a3dd30a200dae8b704
# Parent  c2acc840963b77b0c354596b11a1660d46a60b22
Rename the Global Facet filter to reduce ambiguity with the old facet filter

diff -r c2acc840963b -r 60a5fc522ec4 artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java	Thu Nov 21 15:35:32 2013 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java	Thu Nov 21 15:37:43 2013 +0100
@@ -1287,7 +1287,7 @@
             log.debug("State '" + stateId + "' has facets " + fs);
         }
 
-        List<Output> gen = generateOutputs(list, filterFacets(fs));
+        List<Output> gen = generateOutputs(list, applyGlobalFilterFacets(fs));
 
         if (debug) {
             log.debug("State '" + stateId + "' has " + gen.size() + " outs");
@@ -1298,7 +1298,7 @@
 
     /** If we use a facet filter that bases the list of compatible facets
      * on the output this artifact is bound to then this returns true */
-    public boolean usesOutputFacetFilter() {
+    public boolean usesOutputGlobalFacetFilter() {
         if (boundToOut == null || boundToOut.isEmpty()) {
             return false;
         }
@@ -1313,8 +1313,8 @@
     /** If a global facet filter and a bounded out are defined
      *  use them to eliminate unwished facets.
      */
-    protected List<Facet> filterFacets(List<Facet> facets) {
-        if (!usesOutputFacetFilter()) {
+    protected List<Facet> applyGlobalFilterFacets(List<Facet> facets) {
+        if (!usesOutputGlobalFacetFilter()) {
             return facets;
         }
 
@@ -1348,7 +1348,7 @@
                 + identifier());
         }
 
-        boolean useFacetFilter = usesOutputFacetFilter();
+        boolean useFacetFilter = usesOutputGlobalFacetFilter();
 
         for (Output out: list) {
             if (debug) {