diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java index 3f4cf28b0..3adcc18d6 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java @@ -70,7 +70,6 @@ import org.libreplan.business.planner.entities.consolidations.CalculatedConsolid import org.libreplan.business.requirements.entities.CriterionRequirement; import org.libreplan.business.resources.daos.ICriterionDAO; import org.libreplan.business.resources.daos.IResourceDAO; -import org.libreplan.business.resources.daos.IResourcesSearcher; import org.libreplan.business.resources.entities.Criterion; import org.libreplan.business.resources.entities.CriterionSatisfaction; import org.libreplan.business.resources.entities.IAssignmentsOnResourceCalculator; @@ -88,7 +87,6 @@ import org.libreplan.business.users.entities.UserOrderAuthorization; import org.libreplan.web.UserUtil; import org.libreplan.web.calendars.BaseCalendarModel; import org.libreplan.web.planner.TaskElementAdapter; -import org.libreplan.web.planner.tabs.CriticalPathBuilder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; @@ -181,9 +179,6 @@ public class PlanningStateCreator { @Autowired private IMoneyCostCalculator moneyCostCalculator; - @Autowired - private IResourcesSearcher resourcesSearcher; - void synchronizeWithSchedule(Order order, IOptionalPersistence persistence) { List synchronizationsNeeded = order .calculateSynchronizationsNeeded(); @@ -1122,10 +1117,6 @@ public class PlanningStateCreator { savedOrderState = order.getState(); } - public List getCriticalPath() { - return CriticalPathBuilder.criticalPathFor(this, resourcesSearcher); - } - } public interface IAllocationCriteria { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java index b4bb6ce8e..82b9dd0f4 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java @@ -396,7 +396,6 @@ public class SaveCommandBuilder { // the deletes on cascade a new root task is fetched causing a // NonUniqueObjectException later taskElementDAO.reattach(rootTask); - rootTask.updateCriticalPathProgress(state.getCriticalPath()); } orderDAO.save(order); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/CriticalPathBuilder.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/CriticalPathBuilder.java index 4f8aa515f..787126bf5 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/CriticalPathBuilder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/CriticalPathBuilder.java @@ -95,7 +95,7 @@ public class CriticalPathBuilder { }); } - public static List criticalPathFor(PlanningState state, + private List criticalPathFor(PlanningState state, IResourcesSearcher resourcesSearcher) { final Order order = state.getOrder(); final Scenario currentScenario = state.getCurrentScenario(); @@ -110,7 +110,7 @@ public class CriticalPathBuilder { return criticalPathCalculator.calculateCriticalPath(graph); } - private static LocalDate asLocalDate(Date date) { + private LocalDate asLocalDate(Date date) { return date != null ? LocalDate.fromDateFields(date) : null; }