From 7c3b85a1be5bb4bf60a97fb58736e7e44794df42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Sun, 12 Dec 2010 17:26:17 +0100 Subject: [PATCH] Rename ITaskLeafConstraint to ITaskPositionConstrained The new name reflects better the meaning of the interface. FEA: ItEr64OTS03PlanificacionHaciaAtras --- ...nstraint.java => ITaskPositionConstrained.java} | 2 +- .../business/planner/entities/Task.java | 2 +- .../business/planner/entities/TaskMilestone.java | 2 +- .../web/planner/TaskElementAdapter.java | 14 +++++++------- .../planner/taskedition/EditTaskController.java | 4 ++-- .../taskedition/TaskPropertiesController.java | 14 +++++++------- 6 files changed, 19 insertions(+), 19 deletions(-) rename navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/{ITaskLeafConstraint.java => ITaskPositionConstrained.java} (96%) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ITaskLeafConstraint.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ITaskPositionConstrained.java similarity index 96% rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ITaskLeafConstraint.java rename to navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ITaskPositionConstrained.java index 4c4d6b1cd..cd851eec5 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ITaskLeafConstraint.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ITaskPositionConstrained.java @@ -26,7 +26,7 @@ package org.navalplanner.business.planner.entities; import org.joda.time.LocalDate; -public interface ITaskLeafConstraint { +public interface ITaskPositionConstrained { TaskPositionConstraint getPositionConstraint(); 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 a7cbecc33..dcd4a5eb8 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 @@ -61,7 +61,7 @@ import org.navalplanner.business.workingday.IntraDayDate.PartialDay; /** * @author Óscar González Fernández */ -public class Task extends TaskElement implements ITaskLeafConstraint { +public class Task extends TaskElement implements ITaskPositionConstrained { public static Task createTask(TaskSource taskSource) { Task task = new Task(); 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 e180e708f..b7831e5da 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 @@ -37,7 +37,7 @@ import org.navalplanner.business.workingday.IntraDayDate; * @author Lorenzo Tilve Álvaro * @author Javier Moran Rua */ -public class TaskMilestone extends TaskElement implements ITaskLeafConstraint { +public class TaskMilestone extends TaskElement implements ITaskPositionConstrained { public static TaskMilestone create(Date initialDate) { Validate.notNull(initialDate); 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 f4f1c3f03..4a5709dc3 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 @@ -66,7 +66,7 @@ import org.navalplanner.business.planner.daos.ITaskElementDAO; import org.navalplanner.business.planner.entities.Dependency; import org.navalplanner.business.planner.entities.Dependency.Type; import org.navalplanner.business.planner.entities.GenericResourceAllocation; -import org.navalplanner.business.planner.entities.ITaskLeafConstraint; +import org.navalplanner.business.planner.entities.ITaskPositionConstrained; import org.navalplanner.business.planner.entities.ResourceAllocation; import org.navalplanner.business.planner.entities.ResourceAllocation.Direction; import org.navalplanner.business.planner.entities.SpecificResourceAllocation; @@ -119,8 +119,8 @@ public class TaskElementAdapter implements ITaskElementAdapter { public static List> getStartConstraintsFor( TaskElement taskElement) { - if (taskElement instanceof ITaskLeafConstraint) { - ITaskLeafConstraint task = (ITaskLeafConstraint) taskElement; + if (taskElement instanceof ITaskPositionConstrained) { + ITaskPositionConstrained task = (ITaskPositionConstrained) taskElement; TaskPositionConstraint startConstraint = task.getPositionConstraint(); final PositionConstraintType constraintType = startConstraint .getConstraintType(); @@ -142,8 +142,8 @@ public class TaskElementAdapter implements ITaskElementAdapter { public static List> getEndConstraintsFor( TaskElement taskElement, LocalDate deadline) { - if (taskElement instanceof ITaskLeafConstraint) { - ITaskLeafConstraint task = (ITaskLeafConstraint) taskElement; + if (taskElement instanceof ITaskPositionConstrained) { + ITaskPositionConstrained task = (ITaskPositionConstrained) taskElement; TaskPositionConstraint endConstraint = task.getPositionConstraint(); PositionConstraintType type = endConstraint.getConstraintType(); switch (type) { @@ -871,8 +871,8 @@ public class TaskElementAdapter implements ITaskElementAdapter { @Override public void moveTo(GanttDate date) { setBeginDate(date); - if (taskElement instanceof ITaskLeafConstraint) { - ITaskLeafConstraint task = (ITaskLeafConstraint) taskElement; + if (taskElement instanceof ITaskPositionConstrained) { + ITaskPositionConstrained task = (ITaskPositionConstrained) taskElement; task.explicityMoved(toLocalDate(date)); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java index 1e2449108..c7c03c9ed 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java @@ -27,7 +27,7 @@ import org.joda.time.LocalDate; import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.planner.entities.AggregateOfResourceAllocations; import org.navalplanner.business.planner.entities.CalculatedValue; -import org.navalplanner.business.planner.entities.ITaskLeafConstraint; +import org.navalplanner.business.planner.entities.ITaskPositionConstrained; import org.navalplanner.business.planner.entities.Task; import org.navalplanner.business.planner.entities.TaskElement; import org.navalplanner.business.workingday.IntraDayDate; @@ -445,7 +445,7 @@ public class EditTaskController extends GenericForwardComposer { } private boolean isTaskLeafConstraint() { - return (taskElement != null && taskElement instanceof ITaskLeafConstraint); + return (taskElement != null && taskElement instanceof ITaskPositionConstrained); } public void showNonPermitChangeResourceAllocationType() { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java index 34e1ea15a..acbc93680 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java @@ -29,7 +29,7 @@ import java.util.List; import org.joda.time.LocalDate; import org.navalplanner.business.orders.entities.Order; -import org.navalplanner.business.planner.entities.ITaskLeafConstraint; +import org.navalplanner.business.planner.entities.ITaskPositionConstrained; import org.navalplanner.business.planner.entities.PositionConstraintType; import org.navalplanner.business.planner.entities.Task; import org.navalplanner.business.planner.entities.TaskElement; @@ -291,8 +291,8 @@ public class TaskPropertiesController extends GenericForwardComposer { showResourceAllocationTypeRow(task); } else { hideDurationRow(); - if (currentTaskElement instanceof ITaskLeafConstraint) { - showStartConstraintRow((ITaskLeafConstraint) currentTaskElement); + if (currentTaskElement instanceof ITaskPositionConstrained) { + showStartConstraintRow((ITaskPositionConstrained) currentTaskElement); } else { hideStartConstraintRow(); } @@ -314,7 +314,7 @@ public class TaskPropertiesController extends GenericForwardComposer { startConstraint.setVisible(false); } - private void showStartConstraintRow(ITaskLeafConstraint task) { + private void showStartConstraintRow(ITaskPositionConstrained task) { startConstraint.setVisible(true); PositionConstraintType type = task.getPositionConstraint() .getConstraintType(); @@ -367,8 +367,8 @@ public class TaskPropertiesController extends GenericForwardComposer { } } - private ITaskLeafConstraint currentTaskElementAsTaskLeafConstraint() { - return (ITaskLeafConstraint) currentTaskElement; + private ITaskPositionConstrained currentTaskElementAsTaskLeafConstraint() { + return (ITaskPositionConstrained) currentTaskElement; } private void hideDurationRow() { @@ -445,7 +445,7 @@ public class TaskPropertiesController extends GenericForwardComposer { public void accept() { boolean ok = true; - if (currentTaskElement instanceof ITaskLeafConstraint) { + if (currentTaskElement instanceof ITaskPositionConstrained) { ok = saveConstraintChanges(); } if (ok) {