diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java index af4a44a16..b6eba3bc9 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java @@ -156,7 +156,7 @@ public class CriterionRequirementHandler implements IndirectCriterionRequirement indirect = findIndirectRequirementByParent( child.getIndirectCriterionRequirement(), parent); if (indirect != null) { - indirect.setIsValid(valid); + indirect.setValid(valid); } propagateValidCriterionRequirement(child, parent, valid); } @@ -168,7 +168,7 @@ public class CriterionRequirementHandler implements IndirectCriterionRequirement indirect = findIndirectRequirementByParent( hoursGroup.getIndirectCriterionRequirement(), parent); if (indirect != null) { - indirect.setIsValid(valid); + indirect.setValid(valid); } } } @@ -326,14 +326,14 @@ public class CriterionRequirementHandler implements parent = (DirectCriterionRequirement) requirement; } else { parent = ((IndirectCriterionRequirement) requirement).getParent(); - valid = ((IndirectCriterionRequirement) requirement).isIsValid(); + valid = ((IndirectCriterionRequirement) requirement).isValid(); } indirect = findIndirectRequirementByParent(oldIndirects, parent); if (indirect == null) { indirect = IndirectCriterionRequirement.create(parent, requirement .getCriterion()); - indirect.setIsValid(valid); + indirect.setValid(valid); } return (IndirectCriterionRequirement) indirect; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java index 3a805aedb..68fba0866 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java @@ -174,7 +174,7 @@ public class HoursGroup extends BaseEntity implements Cloneable, criterions.add(criterionRequirement.getCriterion()); } for (IndirectCriterionRequirement requirement : getIndirectCriterionRequirement()) { - if (requirement.isIsValid()) { + if (requirement.isValid()) { criterions.add(requirement.getCriterion()); } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java index 7aff440b6..54632d7da 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java @@ -541,7 +541,7 @@ public abstract class OrderElement extends BaseEntity implements */ public void setValidCriterionRequirement(IndirectCriterionRequirement requirement,boolean valid){ - requirement.setIsValid(valid); + requirement.setValid(valid); criterionRequirementHandler.propagateValidCriterionRequirement(this, requirement.getParent(), valid); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/CriterionRequirement.java b/navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/CriterionRequirement.java index 211b90a0a..9270736c8 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/CriterionRequirement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/CriterionRequirement.java @@ -76,4 +76,8 @@ public class CriterionRequirement extends BaseEntity{ public void setOrderElement(OrderElement orderElement) { this.orderElement = orderElement; } + + public boolean isValid() { + return true; + } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/IndirectCriterionRequirement.java b/navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/IndirectCriterionRequirement.java index bab74cbcd..b06f5fad4 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/IndirectCriterionRequirement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/IndirectCriterionRequirement.java @@ -19,6 +19,8 @@ */ package org.navalplanner.business.requirements.entities; + +import org.apache.commons.lang.BooleanUtils; import org.hibernate.validator.NotNull; import org.navalplanner.business.orders.entities.HoursGroup; import org.navalplanner.business.orders.entities.OrderElement; @@ -33,7 +35,7 @@ public class IndirectCriterionRequirement extends CriterionRequirement{ private DirectCriterionRequirement parent; - private Boolean isValid = true; + private Boolean valid = true; public static IndirectCriterionRequirement create(DirectCriterionRequirement parent,Criterion criterion) { @@ -77,11 +79,12 @@ public class IndirectCriterionRequirement extends CriterionRequirement{ this.parent = directCriterionRequirement; } - public boolean isIsValid() { - return isValid; + @Override + public boolean isValid() { + return BooleanUtils.toBoolean(valid); } - public void setIsValid(boolean isValid) { - this.isValid = isValid; + public void setValid(Boolean valid) { + this.valid = BooleanUtils.toBoolean(valid); } } diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/requirements/entities/Requirements.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/requirements/entities/Requirements.hbm.xml index 70540ad8e..5f7c207db 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/requirements/entities/Requirements.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/requirements/entities/Requirements.hbm.xml @@ -26,7 +26,7 @@ - + diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java index f599f6a38..fab0b7190 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java @@ -169,14 +169,14 @@ public class CriterionRequirementWrapper implements INewObject { if ((criterionRequirement != null) && (criterionRequirement instanceof IndirectCriterionRequirement)) { ((IndirectCriterionRequirement) criterionRequirement) - .setIsValid(valid); + .setValid(valid); } } private void initValid(CriterionRequirement requirement) { this.valid = true; if(criterionRequirement instanceof IndirectCriterionRequirement){ - this.valid = ((IndirectCriterionRequirement)criterionRequirement).isIsValid(); + this.valid = ((IndirectCriterionRequirement)criterionRequirement).isValid(); } } @@ -184,7 +184,7 @@ public class CriterionRequirementWrapper implements INewObject { if ((criterionRequirement != null) && (criterionRequirement instanceof IndirectCriterionRequirement)) { return ((IndirectCriterionRequirement) criterionRequirement) - .isIsValid(); + .isValid(); } return valid == null ? false : valid; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/HoursGroupWrapper.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/HoursGroupWrapper.java index a761e0ee1..4a4ab53f8 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/HoursGroupWrapper.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/HoursGroupWrapper.java @@ -338,7 +338,7 @@ public class HoursGroupWrapper implements INewObject, List result = new ArrayList(); for (IndirectCriterionRequirement requirement : hoursGroup .getIndirectCriterionRequirement()) { - if (!requirement.isIsValid()) { + if (!requirement.isValid()) { result.add(requirement); } } @@ -349,7 +349,7 @@ public class HoursGroupWrapper implements INewObject, List result = new ArrayList(); for (IndirectCriterionRequirement requirement : hoursGroup .getIndirectCriterionRequirement()) { - if (requirement.isIsValid()) { + if (requirement.isValid()) { result.add(requirement); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/IndirectCriterionRequirementDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/IndirectCriterionRequirementDTO.java index 03b9c7598..4adece392 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/IndirectCriterionRequirementDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/IndirectCriterionRequirementDTO.java @@ -33,16 +33,16 @@ import org.navalplanner.business.requirements.entities.IndirectCriterionRequirem @XmlRootElement(name = "indirect-criterion-requirement") public class IndirectCriterionRequirementDTO extends CriterionRequirementDTO { - @XmlAttribute(name = "is-valid") - public boolean isValid = true; + @XmlAttribute(name = "valid") + public boolean valid = true; public IndirectCriterionRequirementDTO() { } public IndirectCriterionRequirementDTO(String name, String type, - boolean isValid) { + boolean valid) { super(name, type); - this.isValid = isValid; + this.valid = valid; } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java index bd1078689..626085114 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java @@ -161,7 +161,7 @@ public final class OrderElementConverter { if (criterionRequirement instanceof IndirectCriterionRequirement) { boolean isValid = ((IndirectCriterionRequirement) criterionRequirement) - .isIsValid(); + .isValid(); return new IndirectCriterionRequirementDTO(name, type, isValid); } else { // criterionRequirement instanceof DirectCriterionRequirement return new DirectCriterionRequirementDTO(name, type); @@ -279,7 +279,7 @@ public final class OrderElementConverter { criterionRequirable, criterion); if (indirectCriterionRequirement != null) { indirectCriterionRequirement - .setIsValid(((IndirectCriterionRequirementDTO) criterionRequirementDTO).isValid); + .setValid(((IndirectCriterionRequirementDTO) criterionRequirementDTO).valid); } } } diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java index 3a36f6b82..3a43783e5 100644 --- a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java +++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java @@ -983,7 +983,7 @@ public class OrderElementServiceTest { assertNotNull(orderElement); assertThat(orderElement.getCriterionRequirements().size(), equalTo(1)); assertFalse(((IndirectCriterionRequirement) orderElement - .getCriterionRequirements().iterator().next()).isIsValid()); + .getCriterionRequirements().iterator().next()).isValid()); } @Test @@ -1086,7 +1086,7 @@ public class OrderElementServiceTest { assertNotNull(orderElement); assertThat(orderElement.getCriterionRequirements().size(), equalTo(1)); assertTrue(((IndirectCriterionRequirement) orderElement - .getCriterionRequirements().iterator().next()).isIsValid()); + .getCriterionRequirements().iterator().next()).isValid()); IndirectCriterionRequirementDTO indirectCriterionRequirementDTO = new IndirectCriterionRequirementDTO( name, type, false); @@ -1104,7 +1104,7 @@ public class OrderElementServiceTest { assertNotNull(orderElement); assertThat(orderElement.getCriterionRequirements().size(), equalTo(1)); assertFalse(((IndirectCriterionRequirement) orderElement - .getCriterionRequirements().iterator().next()).isIsValid()); + .getCriterionRequirements().iterator().next()).isValid()); } @Test @@ -1156,7 +1156,7 @@ public class OrderElementServiceTest { assertNotNull(orderElement); assertThat(orderElement.getCriterionRequirements().size(), equalTo(1)); assertFalse(((IndirectCriterionRequirement) orderElement - .getCriterionRequirements().iterator().next()).isIsValid()); + .getCriterionRequirements().iterator().next()).isValid()); } }