RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr46S19CUProcuraOrganizacionsTraballoItEr40S22: Changed "isValid" for "valid" as attribute name at IndirectCriterionRequirement entity.

Browse source 
NOTE: This change makes that all current IndirectCriterionRequirement already stored in database are invalid.
This commit is contained in:
Manuel Rego Casasnovas 2010-02-04 22:50:35 +01:00 • committed by Javier Moran Rua
parent 6cc8a36860
commit 51648ea1cd
11 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java
View file

@ -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;
}

2
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java
View file

@ -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());
}
}

2
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
View file

@ -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);
}

4
navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/CriterionRequirement.java
View file

@ -76,4 +76,8 @@ public class CriterionRequirement extends BaseEntity{
public void setOrderElement(OrderElement orderElement) {
this.orderElement = orderElement;
}
public boolean isValid() {
return true;
}
}

13
navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/IndirectCriterionRequirement.java
View file

@ -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);
}
}

2
navalplanner-business/src/main/resources/org/navalplanner/business/requirements/entities/Requirements.hbm.xml
View file

@ -26,7 +26,7 @@
</subclass>
<subclass discriminator-value="INDIRECT" name="IndirectCriterionRequirement">
<many-to-one class="DirectCriterionRequirement" column="parent" name="parent"/>
<property access="field" name="isValid"/>
<property access="field" name="valid"/>
</subclass>
</class>
</hibernate-mapping>

6
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java
View file

@ -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;
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/HoursGroupWrapper.java
View file

@ -338,7 +338,7 @@ public class HoursGroupWrapper implements INewObject,
List<IndirectCriterionRequirement> result = new ArrayList<IndirectCriterionRequirement>();
for (IndirectCriterionRequirement requirement : hoursGroup
.getIndirectCriterionRequirement()) {
if (!requirement.isIsValid()) {
if (!requirement.isValid()) {
result.add(requirement);
}
}
@ -349,7 +349,7 @@ public class HoursGroupWrapper implements INewObject,
List<IndirectCriterionRequirement> result = new ArrayList<IndirectCriterionRequirement>();
for (IndirectCriterionRequirement requirement : hoursGroup
.getIndirectCriterionRequirement()) {
if (requirement.isIsValid()) {
if (requirement.isValid()) {
result.add(requirement);
}
}

8
navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/IndirectCriterionRequirementDTO.java
View file

@ -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;
}
}

4
navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java
View file

@ -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);
}
}
}

8
navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java
View file

@ -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());
}
}