From 4cd35c09578348a3a04d31a8ceeb093ceab2cf4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 15 Feb 2010 00:04:17 +0100 Subject: [PATCH] ItEr47S11CUVisualizacionResponsabilidadesTRaballoNaPlanificacionItEr46S12: Exposing can be explicitly resized property from TaskElements. --- .../org/zkoss/ganttz/data/DefaultFundamentalProperties.java | 5 +++++ .../org/zkoss/ganttz/data/ITaskFundamentalProperties.java | 2 ++ ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java | 4 ++++ .../org/navalplanner/business/planner/entities/Task.java | 5 +++++ .../navalplanner/business/planner/entities/TaskElement.java | 5 +++++ .../navalplanner/business/planner/entities/TaskGroup.java | 5 +++++ .../business/planner/entities/TaskMilestone.java | 5 +++++ .../org/navalplanner/web/planner/TaskElementAdapter.java | 5 +++++ 8 files changed, 36 insertions(+) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java index 3bf4355e9..339009a41 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java @@ -167,4 +167,9 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties return false; } + @Override + public boolean canBeExplicitlyResized() { + return true; + } + } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java index d57dc6c56..3fd27d504 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java @@ -78,4 +78,6 @@ public interface ITaskFundamentalProperties { public boolean isSubcontracted(); + public boolean canBeExplicitlyResized(); + } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java index 0bf4510b1..fc85a3214 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java @@ -310,4 +310,8 @@ public abstract class Task implements ITaskFundamentalProperties { return fundamentalProperties.isSubcontracted(); } + public boolean canBeExplicitlyResized() { + return fundamentalProperties.canBeExplicitlyResized(); + } + } 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 dd82decb9..6fdf6f3ae 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 @@ -483,4 +483,9 @@ public class Task extends TaskElement { return calculatedValue != CalculatedValue.END_DATE; } + @Override + public boolean canBeExplicitlyResized() { + return canBeResized() && !isSubcontracted(); + } + } 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 3c77cc2fa..7acd3a380 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 @@ -239,6 +239,11 @@ public abstract class TaskElement extends BaseEntity { protected abstract boolean canBeResized(); + /** + * @return if this task can be resized by an explicit action + */ + public abstract boolean canBeExplicitlyResized(); + public LocalDate getDeadline() { return deadline; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java index fc0d1f9c1..345aac382 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java @@ -142,4 +142,9 @@ public class TaskGroup extends TaskElement { protected boolean canBeResized() { return true; } + + @Override + public boolean canBeExplicitlyResized() { + return false; + } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskMilestone.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskMilestone.java index c8996bfa0..feaa60fcf 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskMilestone.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskMilestone.java @@ -119,4 +119,9 @@ public class TaskMilestone extends TaskElement { protected boolean canBeResized() { return false; } + + @Override + public boolean canBeExplicitlyResized() { + return false; + } } \ No newline at end of file diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java index c1f22165e..c9a36b44b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java @@ -542,6 +542,11 @@ public class TaskElementAdapter implements ITaskElementAdapter { reattachAllResourcesForTask(); } + @Override + public boolean canBeExplicitlyResized() { + return taskElement.canBeExplicitlyResized(); + } + } @Override