From 356508f2030913c2cbe5bec9ec938b8df9e318fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 8 Nov 2010 16:30:59 +0100 Subject: [PATCH] Push down workableDays to Task from TaskElement FEA: ItEr61OTS04PlanificacionHaciaAtras --- .../navalplanner/business/planner/entities/Task.java | 11 +++++++++++ .../business/planner/entities/TaskElement.java | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java index a69288820..1780e8d4f 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java @@ -23,6 +23,7 @@ package org.navalplanner.business.planner.entities; import static org.navalplanner.business.workingday.EffortDuration.min; import static org.navalplanner.business.workingday.EffortDuration.zero; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -116,6 +117,8 @@ public class Task extends TaskElement implements ITaskLeafConstraint { private Consolidation consolidation; + private BigDecimal workableDays; + /** * Constructor for hibernate. Do not use! */ @@ -688,4 +691,12 @@ public class Task extends TaskElement implements ITaskLeafConstraint { return getIntraDayStartDate(); } + public void setWorkableDays(BigDecimal workableDays) { + this.workableDays = workableDays; + } + + public BigDecimal getWorkableDays() { + return workableDays; + } + } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java index 14f4a19b9..1607f82e9 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java @@ -118,8 +118,6 @@ public abstract class TaskElement extends BaseEntity { private IntraDayDate endDate; - private BigDecimal workableDays; - private LocalDate deadline; private String name; @@ -604,12 +602,4 @@ public abstract class TaskElement extends BaseEntity { return sumOfHoursAllocated; } - public void setWorkableDays(BigDecimal workableDays) { - this.workableDays = workableDays; - } - - public BigDecimal getWorkableDays() { - return workableDays; - } - }