diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/BaseEntity.java b/libreplan-business/src/main/java/org/libreplan/business/common/BaseEntity.java index 2635a206a..cf2b3650a 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/BaseEntity.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/BaseEntity.java @@ -110,7 +110,7 @@ public abstract class BaseEntity implements INewObject { } protected static T create(T baseEntity) { - baseEntity.newObject = true; + baseEntity.setNewObject(true); return baseEntity; } diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java b/libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java index 9856fdeae..915762aff 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java @@ -67,7 +67,7 @@ public abstract class IntegrationEntity extends BaseEntity { T integrationEntity, String code) { BaseEntity.create(integrationEntity); - integrationEntity.code = code; + integrationEntity.setCode(code); return integrationEntity; @@ -82,7 +82,7 @@ public abstract class IntegrationEntity extends BaseEntity { T integrationEntity) { BaseEntity.create(integrationEntity); - integrationEntity.code = generateCode(); + integrationEntity.setCode(generateCode()); return integrationEntity; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java index 3afb60855..3af1c9817 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java @@ -136,7 +136,7 @@ public abstract class TaskElement extends BaseEntity { protected static T create(T taskElement, TaskSource taskSource) { - taskElement.taskSource = taskSource; + taskElement.setTaskSource(taskSource); taskElement.updateDeadlineFromOrderElement(); taskElement.setName(taskElement.getOrderElement().getName()); taskElement.updateAdvancePercentageFromOrderElement(); @@ -218,6 +218,10 @@ public abstract class TaskElement extends BaseEntity { return taskSource; } + protected void setTaskSource(TaskSource taskSource) { + this.taskSource = taskSource; + } + protected void copyDependenciesTo(TaskElement result) { for (Dependency dependency : getDependenciesWithThisOrigin()) { Dependency.create(result, dependency.getDestination(), diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/AllocationModification.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/AllocationModification.java index b595e3948..df3c5ddee 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/AllocationModification.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/AllocationModification.java @@ -98,7 +98,7 @@ public abstract class AllocationModification { .unmodifiableList(new ArrayList(resources)); } - private boolean hasNoResources() { + protected boolean hasNoResources() { return resourcesOnWhichApplyAllocation.isEmpty(); } diff --git a/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java b/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java index 2d350f74a..c7f04ecc8 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java +++ b/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java @@ -107,18 +107,18 @@ public abstract class OrderElementTemplate extends BaseEntity implements .getInitDate()); Days fromBeginningToEnd = daysBetween(order.getInitDate(), origin .getDeadline()); - beingBuilt.materialAssignments = copyMaterialAssignmentsFrom(beingBuilt, origin - .getMaterialAssignments()); - beingBuilt.criterionRequirements = copyDirectCriterionRequirements( - beingBuilt, origin.getDirectCriterionRequirement()); - beingBuilt.labels = new HashSet