From 4aef6230bdd233cbc0f4db4519961e8ba838e68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 12 Aug 2010 12:13:01 +0200 Subject: [PATCH] ItEr60S19TimeUnitDataType: Move ResourcesPerDay and associated classes to a new workingday package. This package will have classes related to workingday dedication, workingday duration and so on. --- .../business/calendars/entities/BaseCalendar.java | 2 +- .../business/calendars/entities/CombinedWorkHours.java | 2 +- .../business/calendars/entities/IWorkHours.java | 2 +- .../business/calendars/entities/SameWorkHoursEveryDay.java | 2 +- .../entities/ThereAreHoursOnWorkHoursCalculator.java | 2 +- .../planner/entities/AggregateOfResourceAllocations.java | 1 + .../planner/entities/GenericResourceAllocation.java | 1 + .../business/planner/entities/HoursDistributor.java | 1 + .../business/planner/entities/IAllocateResourcesPerDay.java | 2 ++ .../business/planner/entities/ResourceAllocation.java | 1 + .../planner/entities/SpecificResourceAllocation.java | 1 + .../navalplanner/business/planner/entities/TaskElement.java | 1 + .../AllocatorForSpecifiedResourcesPerDayAndHours.java | 2 +- .../ResourceAllocationWithDesiredResourcesPerDay.java | 2 +- .../allocationalgorithms/ResourcesPerDayModification.java | 2 +- .../limiting/entities/LimitingResourceAllocator.java | 2 +- .../{planner/entities => workingday}/ResourcesPerDay.java | 2 +- .../hibernate/ResourcesPerDayType.java | 4 ++-- .../business/planner/entities/ResourceAllocations.hbm.xml | 2 +- .../test/planner/daos/ResourceAllocationDAOTest.java | 2 +- .../entities/AggregateOfResourceAllocationsTest.java | 2 +- .../planner/entities/AllocationUntilFillingHoursTest.java | 2 +- .../planner/entities/GenericResourceAllocationTest.java | 2 +- .../planner/entities/SpecificResourceAllocationTest.java | 2 +- .../entities => workingday}/ResourcesPerDayTest.java | 6 +++--- .../hibernate/EntityContainingResourcePerDay.java | 4 ++-- .../hibernate/ResourcesPerDayTypeTest.java | 4 ++-- .../src/test/resources/TestEntities.hbm.xml | 4 ++-- .../navalplanner/web/planner/allocation/AllocationRow.java | 2 +- .../org/navalplanner/web/planner/allocation/FormBinder.java | 2 +- .../web/planner/allocation/GenericAllocationRow.java | 2 +- .../web/planner/allocation/SpecificAllocationRow.java | 2 +- 32 files changed, 39 insertions(+), 31 deletions(-) rename navalplanner-business/src/main/java/org/navalplanner/business/{planner/entities => workingday}/ResourcesPerDay.java (98%) rename navalplanner-business/src/main/java/org/navalplanner/business/{planner/entities => workingday}/hibernate/ResourcesPerDayType.java (96%) rename navalplanner-business/src/test/java/org/navalplanner/business/test/{planner/entities => workingday}/ResourcesPerDayTest.java (97%) rename navalplanner-business/src/test/java/org/navalplanner/business/test/{planner/entities => workingday}/hibernate/EntityContainingResourcePerDay.java (90%) rename navalplanner-business/src/test/java/org/navalplanner/business/test/{planner/entities => workingday}/hibernate/ResourcesPerDayTypeTest.java (95%) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java index 0caa3c0c3..1045931df 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java @@ -37,7 +37,7 @@ import org.navalplanner.business.calendars.daos.IBaseCalendarDAO; import org.navalplanner.business.calendars.entities.CalendarData.Days; import org.navalplanner.business.common.IntegrationEntity; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; -import org.navalplanner.business.planner.entities.ResourcesPerDay; +import org.navalplanner.business.workingday.ResourcesPerDay; /** * Represents a calendar with some exception days. A calendar is valid till the diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java index a105504aa..6e48f7641 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java @@ -27,7 +27,7 @@ import java.util.List; import org.apache.commons.lang.Validate; import org.joda.time.LocalDate; -import org.navalplanner.business.planner.entities.ResourcesPerDay; +import org.navalplanner.business.workingday.ResourcesPerDay; public abstract class CombinedWorkHours implements IWorkHours { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/IWorkHours.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/IWorkHours.java index e1bd3545d..4e2ef9050 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/IWorkHours.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/IWorkHours.java @@ -21,7 +21,7 @@ package org.navalplanner.business.calendars.entities; import org.joda.time.LocalDate; -import org.navalplanner.business.planner.entities.ResourcesPerDay; +import org.navalplanner.business.workingday.ResourcesPerDay; public interface IWorkHours { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/SameWorkHoursEveryDay.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/SameWorkHoursEveryDay.java index fb6238d30..ab3e214a6 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/SameWorkHoursEveryDay.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/SameWorkHoursEveryDay.java @@ -22,7 +22,7 @@ package org.navalplanner.business.calendars.entities; import org.apache.commons.lang.Validate; import org.joda.time.LocalDate; -import org.navalplanner.business.planner.entities.ResourcesPerDay; +import org.navalplanner.business.workingday.ResourcesPerDay; public class SameWorkHoursEveryDay implements IWorkHours { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ThereAreHoursOnWorkHoursCalculator.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ThereAreHoursOnWorkHoursCalculator.java index ce70f148e..e7d4603a2 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ThereAreHoursOnWorkHoursCalculator.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ThereAreHoursOnWorkHoursCalculator.java @@ -26,7 +26,7 @@ import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.EndOfTi import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.FixedPoint; import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.Interval; import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.StartOfTime; -import org.navalplanner.business.planner.entities.ResourcesPerDay; +import org.navalplanner.business.workingday.ResourcesPerDay; /** * @author Óscar González Fernández diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AggregateOfResourceAllocations.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AggregateOfResourceAllocations.java index 597892d32..1b485731d 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AggregateOfResourceAllocations.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AggregateOfResourceAllocations.java @@ -31,6 +31,7 @@ import java.util.Set; import org.apache.commons.lang.Validate; import org.joda.time.Days; import org.joda.time.LocalDate; +import org.navalplanner.business.workingday.ResourcesPerDay; /** * Computes aggregate values on a set{@link ResourceAllocation}. diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java index 323169ba4..f49fced60 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java @@ -46,6 +46,7 @@ import org.navalplanner.business.resources.entities.Resource; import org.navalplanner.business.scenarios.entities.Scenario; import org.navalplanner.business.util.deepcopy.OnCopy; import org.navalplanner.business.util.deepcopy.Strategy; +import org.navalplanner.business.workingday.ResourcesPerDay; /** * Represents the relation between {@link Task} and a generic {@link Resource}. diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/HoursDistributor.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/HoursDistributor.java index 3cbe22530..9eebb3c02 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/HoursDistributor.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/HoursDistributor.java @@ -30,6 +30,7 @@ import org.navalplanner.business.calendars.entities.IWorkHours; import org.navalplanner.business.calendars.entities.ResourceCalendar; import org.navalplanner.business.calendars.entities.SameWorkHoursEveryDay; import org.navalplanner.business.resources.entities.Resource; +import org.navalplanner.business.workingday.ResourcesPerDay; /** * @author Óscar González Fernández diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/IAllocateResourcesPerDay.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/IAllocateResourcesPerDay.java index 9cb23ddaf..1edf8edc5 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/IAllocateResourcesPerDay.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/IAllocateResourcesPerDay.java @@ -19,6 +19,8 @@ */ package org.navalplanner.business.planner.entities; +import org.navalplanner.business.workingday.ResourcesPerDay; + /** * Represents an object in which can be allocated some {@link ResourcesPerDay}
* @author Óscar González Fernández diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java index 4e9692727..fd48f980d 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java @@ -60,6 +60,7 @@ import org.navalplanner.business.scenarios.IScenarioManager; import org.navalplanner.business.scenarios.entities.Scenario; import org.navalplanner.business.util.deepcopy.OnCopy; import org.navalplanner.business.util.deepcopy.Strategy; +import org.navalplanner.business.workingday.ResourcesPerDay; /** * Resources are allocated to planner tasks. diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java index 7ac2d7eb9..a8313dff0 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java @@ -47,6 +47,7 @@ import org.navalplanner.business.resources.entities.Worker; import org.navalplanner.business.scenarios.entities.Scenario; import org.navalplanner.business.util.deepcopy.OnCopy; import org.navalplanner.business.util.deepcopy.Strategy; +import org.navalplanner.business.workingday.ResourcesPerDay; /** * Represents the relation between {@link Task} and a specific {@link Worker}. diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java index 85d95877b..2494ac495 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java @@ -43,6 +43,7 @@ import org.navalplanner.business.planner.entities.Dependency.Type; import org.navalplanner.business.scenarios.entities.Scenario; import org.navalplanner.business.util.deepcopy.OnCopy; import org.navalplanner.business.util.deepcopy.Strategy; +import org.navalplanner.business.workingday.ResourcesPerDay; /** * @author Óscar González Fernández diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocatorForSpecifiedResourcesPerDayAndHours.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocatorForSpecifiedResourcesPerDayAndHours.java index f92f48b6e..406ce3853 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocatorForSpecifiedResourcesPerDayAndHours.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocatorForSpecifiedResourcesPerDayAndHours.java @@ -34,8 +34,8 @@ import org.apache.commons.lang.Validate; import org.joda.time.LocalDate; import org.navalplanner.business.planner.entities.DayAssignment; import org.navalplanner.business.planner.entities.ResourceAllocation; -import org.navalplanner.business.planner.entities.ResourcesPerDay; import org.navalplanner.business.planner.entities.Task; +import org.navalplanner.business.workingday.ResourcesPerDay; public abstract class AllocatorForSpecifiedResourcesPerDayAndHours { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java index 9fc5efee7..de89790c3 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java @@ -26,7 +26,7 @@ import java.util.List; import org.apache.commons.lang.Validate; import org.navalplanner.business.planner.entities.ResourceAllocation; -import org.navalplanner.business.planner.entities.ResourcesPerDay; +import org.navalplanner.business.workingday.ResourcesPerDay; public class ResourceAllocationWithDesiredResourcesPerDay { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java index d2a3cf9b4..b11fd59f5 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java @@ -36,11 +36,11 @@ import org.navalplanner.business.planner.entities.AvailabilityCalculator; import org.navalplanner.business.planner.entities.DayAssignment; import org.navalplanner.business.planner.entities.GenericResourceAllocation; import org.navalplanner.business.planner.entities.ResourceAllocation; -import org.navalplanner.business.planner.entities.ResourcesPerDay; import org.navalplanner.business.planner.entities.SpecificResourceAllocation; import org.navalplanner.business.resources.daos.IResourceDAO; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.Resource; +import org.navalplanner.business.workingday.ResourcesPerDay; public abstract class ResourcesPerDayModification extends AllocationModification { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java index 692eafe1d..8d6267b84 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java @@ -33,12 +33,12 @@ import org.navalplanner.business.planner.entities.DayAssignment; import org.navalplanner.business.planner.entities.GenericDayAssignment; import org.navalplanner.business.planner.entities.GenericResourceAllocation; import org.navalplanner.business.planner.entities.ResourceAllocation; -import org.navalplanner.business.planner.entities.ResourcesPerDay; import org.navalplanner.business.planner.entities.SpecificDayAssignment; import org.navalplanner.business.planner.entities.SpecificResourceAllocation; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.LimitingResourceQueue; import org.navalplanner.business.resources.entities.Resource; +import org.navalplanner.business.workingday.ResourcesPerDay; /** * Handles all the logic related to allocation of diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourcesPerDay.java b/navalplanner-business/src/main/java/org/navalplanner/business/workingday/ResourcesPerDay.java similarity index 98% rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourcesPerDay.java rename to navalplanner-business/src/main/java/org/navalplanner/business/workingday/ResourcesPerDay.java index 8257544a5..3b4484ac3 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourcesPerDay.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workingday/ResourcesPerDay.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package org.navalplanner.business.planner.entities; +package org.navalplanner.business.workingday; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/hibernate/ResourcesPerDayType.java b/navalplanner-business/src/main/java/org/navalplanner/business/workingday/hibernate/ResourcesPerDayType.java similarity index 96% rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/hibernate/ResourcesPerDayType.java rename to navalplanner-business/src/main/java/org/navalplanner/business/workingday/hibernate/ResourcesPerDayType.java index a7cad6f82..8f29b9718 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/hibernate/ResourcesPerDayType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workingday/hibernate/ResourcesPerDayType.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package org.navalplanner.business.planner.entities.hibernate; +package org.navalplanner.business.workingday.hibernate; import java.io.Serializable; import java.math.BigDecimal; @@ -30,7 +30,7 @@ import java.sql.Types; import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.usertype.UserType; -import org.navalplanner.business.planner.entities.ResourcesPerDay; +import org.navalplanner.business.workingday.ResourcesPerDay; /** * Persists a {@link ResourcesPerDay} through hibernate diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml index a4304ad0c..5deeff1f3 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml @@ -12,7 +12,7 @@ - + diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/ResourceAllocationDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/ResourceAllocationDAOTest.java index 755044082..55c968102 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/ResourceAllocationDAOTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/ResourceAllocationDAOTest.java @@ -48,7 +48,6 @@ import org.navalplanner.business.planner.daos.ITaskElementDAO; import org.navalplanner.business.planner.daos.ITaskSourceDAO; import org.navalplanner.business.planner.entities.GenericResourceAllocation; import org.navalplanner.business.planner.entities.ResourceAllocation; -import org.navalplanner.business.planner.entities.ResourcesPerDay; import org.navalplanner.business.planner.entities.SpecificResourceAllocation; import org.navalplanner.business.planner.entities.Task; import org.navalplanner.business.resources.daos.IResourceDAO; @@ -59,6 +58,7 @@ import org.navalplanner.business.scenarios.IScenarioManager; import org.navalplanner.business.scenarios.bootstrap.IScenariosBootstrap; import org.navalplanner.business.scenarios.entities.OrderVersion; import org.navalplanner.business.scenarios.entities.Scenario; +import org.navalplanner.business.workingday.ResourcesPerDay; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AggregateOfResourceAllocationsTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AggregateOfResourceAllocationsTest.java index 5a1742406..12a5776bb 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AggregateOfResourceAllocationsTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AggregateOfResourceAllocationsTest.java @@ -37,7 +37,7 @@ import java.util.Map; import org.junit.Test; import org.navalplanner.business.planner.entities.AggregateOfResourceAllocations; import org.navalplanner.business.planner.entities.ResourceAllocation; -import org.navalplanner.business.planner.entities.ResourcesPerDay; +import org.navalplanner.business.workingday.ResourcesPerDay; public class AggregateOfResourceAllocationsTest { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AllocationUntilFillingHoursTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AllocationUntilFillingHoursTest.java index bd98f3239..99a5bba31 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AllocationUntilFillingHoursTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AllocationUntilFillingHoursTest.java @@ -36,13 +36,13 @@ import org.joda.time.LocalDate; import org.junit.Test; import org.navalplanner.business.planner.entities.GenericResourceAllocation; import org.navalplanner.business.planner.entities.ResourceAllocation; -import org.navalplanner.business.planner.entities.ResourcesPerDay; import org.navalplanner.business.planner.entities.SpecificResourceAllocation; import org.navalplanner.business.planner.entities.Task; import org.navalplanner.business.planner.entities.allocationalgorithms.ResourcesPerDayModification; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.Resource; import org.navalplanner.business.resources.entities.Worker; +import org.navalplanner.business.workingday.ResourcesPerDay; public class AllocationUntilFillingHoursTest { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java index 02878bafa..70af2fc88 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java @@ -52,7 +52,6 @@ import org.navalplanner.business.calendars.entities.ResourceCalendar; import org.navalplanner.business.calendars.entities.SameWorkHoursEveryDay; import org.navalplanner.business.planner.entities.GenericDayAssignment; import org.navalplanner.business.planner.entities.GenericResourceAllocation; -import org.navalplanner.business.planner.entities.ResourcesPerDay; import org.navalplanner.business.planner.entities.Task; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.CriterionSatisfaction; @@ -61,6 +60,7 @@ import org.navalplanner.business.resources.entities.Resource; import org.navalplanner.business.resources.entities.VirtualWorker; import org.navalplanner.business.resources.entities.Worker; import org.navalplanner.business.scenarios.entities.Scenario; +import org.navalplanner.business.workingday.ResourcesPerDay; public class GenericResourceAllocationTest { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java index 4b5ecf255..05a2cd1d8 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java @@ -49,13 +49,13 @@ import org.junit.Test; import org.navalplanner.business.calendars.entities.AvailabilityTimeLine; import org.navalplanner.business.calendars.entities.BaseCalendar; import org.navalplanner.business.calendars.entities.ResourceCalendar; -import org.navalplanner.business.planner.entities.ResourcesPerDay; import org.navalplanner.business.planner.entities.SpecificDayAssignment; import org.navalplanner.business.planner.entities.SpecificResourceAllocation; import org.navalplanner.business.planner.entities.Task; import org.navalplanner.business.planner.entities.ResourceAllocation.DetachDayAssignmentOnRemoval; import org.navalplanner.business.planner.entities.ResourceAllocation.IOnDayAssignmentRemoval; import org.navalplanner.business.resources.entities.Worker; +import org.navalplanner.business.workingday.ResourcesPerDay; public class SpecificResourceAllocationTest { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/ResourcesPerDayTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/workingday/ResourcesPerDayTest.java similarity index 97% rename from navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/ResourcesPerDayTest.java rename to navalplanner-business/src/test/java/org/navalplanner/business/test/workingday/ResourcesPerDayTest.java index 67c51eaf8..db1607ba6 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/ResourcesPerDayTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/workingday/ResourcesPerDayTest.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package org.navalplanner.business.test.planner.entities; +package org.navalplanner.business.test.workingday; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertEquals; @@ -32,8 +32,8 @@ import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.junit.Test; -import org.navalplanner.business.planner.entities.ResourcesPerDay; -import org.navalplanner.business.planner.entities.ResourcesPerDay.ResourcesPerDayDistributor; +import org.navalplanner.business.workingday.ResourcesPerDay; +import org.navalplanner.business.workingday.ResourcesPerDay.ResourcesPerDayDistributor; public class ResourcesPerDayTest { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/hibernate/EntityContainingResourcePerDay.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/workingday/hibernate/EntityContainingResourcePerDay.java similarity index 90% rename from navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/hibernate/EntityContainingResourcePerDay.java rename to navalplanner-business/src/test/java/org/navalplanner/business/test/workingday/hibernate/EntityContainingResourcePerDay.java index 55a71669a..3b70b0efe 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/hibernate/EntityContainingResourcePerDay.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/workingday/hibernate/EntityContainingResourcePerDay.java @@ -18,9 +18,9 @@ * along with this program. If not, see . */ -package org.navalplanner.business.test.planner.entities.hibernate; +package org.navalplanner.business.test.workingday.hibernate; -import org.navalplanner.business.planner.entities.ResourcesPerDay; +import org.navalplanner.business.workingday.ResourcesPerDay; public class EntityContainingResourcePerDay { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/hibernate/ResourcesPerDayTypeTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/workingday/hibernate/ResourcesPerDayTypeTest.java similarity index 95% rename from navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/hibernate/ResourcesPerDayTypeTest.java rename to navalplanner-business/src/test/java/org/navalplanner/business/test/workingday/hibernate/ResourcesPerDayTypeTest.java index 06d401dd5..59f89f0a4 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/hibernate/ResourcesPerDayTypeTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/workingday/hibernate/ResourcesPerDayTypeTest.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package org.navalplanner.business.test.planner.entities.hibernate; +package org.navalplanner.business.test.workingday.hibernate; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertNotSame; @@ -32,7 +32,7 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.junit.Test; import org.junit.runner.RunWith; -import org.navalplanner.business.planner.entities.ResourcesPerDay; +import org.navalplanner.business.workingday.ResourcesPerDay; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/navalplanner-business/src/test/resources/TestEntities.hbm.xml b/navalplanner-business/src/test/resources/TestEntities.hbm.xml index 8cbcbf278..4c1eda7ff 100644 --- a/navalplanner-business/src/test/resources/TestEntities.hbm.xml +++ b/navalplanner-business/src/test/resources/TestEntities.hbm.xml @@ -36,12 +36,12 @@ - + 100 - + diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java index c727fc58c..6dea85071 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java @@ -30,13 +30,13 @@ import org.apache.commons.lang.Validate; import org.navalplanner.business.planner.entities.CalculatedValue; import org.navalplanner.business.planner.entities.DerivedAllocation; import org.navalplanner.business.planner.entities.ResourceAllocation; -import org.navalplanner.business.planner.entities.ResourcesPerDay; import org.navalplanner.business.planner.entities.Task; import org.navalplanner.business.planner.entities.Task.ModifiedAllocation; import org.navalplanner.business.planner.entities.allocationalgorithms.HoursModification; import org.navalplanner.business.planner.entities.allocationalgorithms.ResourcesPerDayModification; import org.navalplanner.business.resources.daos.IResourceDAO; import org.navalplanner.business.resources.entities.Resource; +import org.navalplanner.business.workingday.ResourcesPerDay; import org.navalplanner.web.common.Util; import org.navalplanner.web.planner.allocation.ResourceAllocationController.DerivedAllocationColumn; import org.zkoss.zk.ui.Component; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java index 0caacbd7b..705d8353d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java @@ -38,10 +38,10 @@ import org.joda.time.format.ISODateTimeFormat; import org.navalplanner.business.common.ProportionalDistributor; import org.navalplanner.business.planner.entities.AggregateOfResourceAllocations; import org.navalplanner.business.planner.entities.CalculatedValue; -import org.navalplanner.business.planner.entities.ResourcesPerDay; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.Resource; import org.navalplanner.business.scenarios.entities.Scenario; +import org.navalplanner.business.workingday.ResourcesPerDay; import org.navalplanner.web.common.IMessagesForUser; import org.navalplanner.web.common.Level; import org.navalplanner.web.common.Util; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java index e9fd28ff8..b7523bdca 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java @@ -30,13 +30,13 @@ import java.util.Set; import org.apache.commons.lang.Validate; import org.navalplanner.business.planner.entities.GenericResourceAllocation; import org.navalplanner.business.planner.entities.ResourceAllocation; -import org.navalplanner.business.planner.entities.ResourcesPerDay; import org.navalplanner.business.planner.entities.Task; import org.navalplanner.business.planner.entities.allocationalgorithms.HoursModification; import org.navalplanner.business.planner.entities.allocationalgorithms.ResourcesPerDayModification; import org.navalplanner.business.resources.daos.IResourceDAO; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.Resource; +import org.navalplanner.business.workingday.ResourcesPerDay; /** * The information required for creating a {@link GenericResourceAllocation} diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationRow.java index c76cbfffc..f5751259e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationRow.java @@ -26,12 +26,12 @@ import java.util.Collections; import java.util.List; import org.navalplanner.business.planner.entities.ResourceAllocation; -import org.navalplanner.business.planner.entities.ResourcesPerDay; import org.navalplanner.business.planner.entities.SpecificResourceAllocation; import org.navalplanner.business.planner.entities.Task; import org.navalplanner.business.planner.entities.allocationalgorithms.HoursModification; import org.navalplanner.business.planner.entities.allocationalgorithms.ResourcesPerDayModification; import org.navalplanner.business.resources.entities.Resource; +import org.navalplanner.business.workingday.ResourcesPerDay; /** * The information required for creating a {@link SpecificResourceAllocation}