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

Rename ITaskLeafConstraint to ITaskPositionConstrained

Browse source 
The new name reflects better the meaning of the interface.

FEA: ItEr64OTS03PlanificacionHaciaAtras
This commit is contained in:
Óscar González Fernández 2010-12-12 17:26:17 +01:00
parent f1f79c5e82
commit 7c3b85a1be
6 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ITaskLeafConstraint.java → navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ITaskPositionConstrained.java
View file

@ -26,7 +26,7 @@ package org.navalplanner.business.planner.entities;
import org.joda.time.LocalDate;
public interface ITaskLeafConstraint {
public interface ITaskPositionConstrained {
TaskPositionConstraint getPositionConstraint();

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
View file

@ -61,7 +61,7 @@ import org.navalplanner.business.workingday.IntraDayDate.PartialDay;
/**
* @author Óscar González Fernández <ogonzalez@igalia.com>
*/
public class Task extends TaskElement implements ITaskLeafConstraint {
public class Task extends TaskElement implements ITaskPositionConstrained {
public static Task createTask(TaskSource taskSource) {
Task task = new Task();

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskMilestone.java
View file

@ -37,7 +37,7 @@ import org.navalplanner.business.workingday.IntraDayDate;
* @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
* @author Javier Moran Rua <jmoran@igalia.com>
*/
public class TaskMilestone extends TaskElement implements ITaskLeafConstraint {
public class TaskMilestone extends TaskElement implements ITaskPositionConstrained {
public static TaskMilestone create(Date initialDate) {
Validate.notNull(initialDate);

14
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
View file

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

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java
View file

@ -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() {

14
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java
View file

@ -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) {