[Bug #911] Use method easier to understand

FEA: ItEr74S04BugFixing

navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java

@@ -355,6 +355,18 @@ public class Criterion extends IntegrationEntity implements ICriterion {
         return false;
     }
 
+    public boolean includes(Criterion other) {
+        if (isEquivalent(other)) {
+            return true;
+        }
+        for (Criterion each : this.getChildren()) {
+            if (each.includes(other)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @AssertTrue(message="a disabled resource has enabled subresources")
     public boolean checkConstraintActive() {
 

navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java

@@ -314,8 +314,7 @@ public abstract class Resource extends IntegrationEntity {
 
                 @Override
                 public boolean accepts(CriterionSatisfaction satisfaction) {
-                    return satisfaction.getCriterion()
-                            .isEquivalentOrIncludedIn(criterion);
+                    return criterion.includes(satisfaction.getCriterion());
                 }
             });
         }