diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/IEarnedValueCalculator.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/IOrderEarnedValueCalculator.java similarity index 97% rename from libreplan-business/src/main/java/org/libreplan/business/planner/entities/IEarnedValueCalculator.java rename to libreplan-business/src/main/java/org/libreplan/business/planner/entities/IOrderEarnedValueCalculator.java index c8928de88..af9b0a8fc 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/IEarnedValueCalculator.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/IOrderEarnedValueCalculator.java @@ -30,7 +30,7 @@ import org.libreplan.business.orders.entities.Order; * * Utility class for calculating all 'Earned Value' measurements */ -public interface IEarnedValueCalculator { +public interface IOrderEarnedValueCalculator { // ACWP (Actual Cost Work Performed) SortedMap calculateActualCostWorkPerformed( diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/EarnedValueCalculator.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/OrderEarnedValueCalculator.java similarity index 98% rename from libreplan-business/src/main/java/org/libreplan/business/planner/entities/EarnedValueCalculator.java rename to libreplan-business/src/main/java/org/libreplan/business/planner/entities/OrderEarnedValueCalculator.java index 218a7f1f2..33d0fe5b4 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/EarnedValueCalculator.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/OrderEarnedValueCalculator.java @@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Component @Scope(BeanDefinition.SCOPE_SINGLETON) -public class EarnedValueCalculator implements IEarnedValueCalculator { +public class OrderEarnedValueCalculator implements IOrderEarnedValueCalculator { @Autowired private ICostCalculator hoursCostCalculator; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusModel.java index c43ddbe7c..838cf8629 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusModel.java @@ -23,7 +23,7 @@ import java.math.BigDecimal; import org.joda.time.LocalDate; import org.libreplan.business.orders.entities.Order; -import org.libreplan.business.planner.entities.IEarnedValueCalculator; +import org.libreplan.business.planner.entities.IOrderEarnedValueCalculator; import org.libreplan.web.planner.order.OrderPlanningModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; @@ -48,7 +48,7 @@ import org.springframework.transaction.annotation.Transactional; public class CostStatusModel implements ICostStatusModel { @Autowired - private IEarnedValueCalculator earnedValueCalculator; + private IOrderEarnedValueCalculator earnedValueCalculator; private Order order; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java index e6ff9c8a0..42de747ad 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java @@ -62,7 +62,7 @@ import org.libreplan.business.planner.chart.ResourceLoadChartData; import org.libreplan.business.planner.entities.DayAssignment; import org.libreplan.business.planner.entities.DayAssignment.FilterType; import org.libreplan.business.planner.entities.ICostCalculator; -import org.libreplan.business.planner.entities.IEarnedValueCalculator; +import org.libreplan.business.planner.entities.IOrderEarnedValueCalculator; import org.libreplan.business.planner.entities.TaskElement; import org.libreplan.business.planner.entities.TaskGroup; import org.libreplan.business.resources.entities.CriterionSatisfaction; @@ -261,7 +261,7 @@ public class OrderPlanningModel implements IOrderPlanningModel { private ICostCalculator hoursCostCalculator; @Autowired - private IEarnedValueCalculator earnedValueCalculator; + private IOrderEarnedValueCalculator earnedValueCalculator; private List earnedValueChartConfigurationCheckboxes = new ArrayList();