From ac1eb27c0621920f91f17e3d4e1a1f53e6a86064 Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Thu, 1 Oct 2009 16:03:00 +0200 Subject: [PATCH] ItEr28S12ClasificacionTraballoItEr27S12: Add isDeleted property to CriterionSatisfaction entity. --- .../resources/entities/CriterionSatisfaction.java | 10 ++++++++++ .../web/resources/criterion/CriterionTreeModel.java | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java index 3e36160a9..30b8252f1 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java @@ -100,6 +100,8 @@ public class CriterionSatisfaction extends BaseEntity { private Resource resource; + private Boolean isDeleted = false; + @Override public String toString() { return ToStringBuilder.reflectionToString(this); @@ -177,6 +179,14 @@ public class CriterionSatisfaction extends BaseEntity { startDate = date; } + public void setIsDeleted(boolean isDeleted) { + this.isDeleted = isDeleted; + } + + public boolean isIsDeleted() { + return isDeleted == null ? false : isDeleted; + } + public boolean overlapsWith(Interval interval) { return getInterval().overlapsWith(interval); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java index cef34b571..af24e9ce7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java @@ -220,7 +220,6 @@ public class CriterionTreeModel implements ICriterionTreeModel{ @Override public void move(CriterionDTO toBeMoved, CriterionDTO destination,int position) { if(isGreatInHierarchy(toBeMoved,destination)){ - System.out.println("******************************* RETURN ********************************"); return; } if(criterionType.allowHierarchy()){