From 5fa07daa1d815cf6a5ba75b7f6bf93035c931352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 21 Sep 2009 18:01:46 +0200
Subject: [PATCH] ItEr27S06CUAsignacionGrupoRecursosAPlanificacionItEr26S07:
 Moving ResourceAllocationWithDesiredResourcesPerDay to top level and
 allocationalgorithms package

---
 .../planner/entities/ResourceAllocation.java  | 23 +---------------
 ...skDurationAndSpecifiedResourcesPerDay.java |  1 -
 ...eAllocationWithDesiredResourcesPerDay.java | 26 +++++++++++++++++++
 .../AllocationUntilFillingHoursTest.java      |  2 +-
 .../allocation/ResourceAllocationModel.java   |  2 +-
 5 files changed, 29 insertions(+), 25 deletions(-)
 create mode 100644 navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java

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 1ee96fc39..bda02e5e0 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
@@ -17,6 +17,7 @@ import org.navalplanner.business.calendars.entities.BaseCalendar;
 import org.navalplanner.business.calendars.entities.SameWorkHoursEveryDay;
 import org.navalplanner.business.common.BaseEntity;
 import org.navalplanner.business.planner.entities.allocationalgorithms.AllocatorForTaskDurationAndSpecifiedResourcesPerDay;
+import org.navalplanner.business.planner.entities.allocationalgorithms.ResourceAllocationWithDesiredResourcesPerDay;
 import org.navalplanner.business.resources.entities.Resource;
 
 /**
@@ -26,28 +27,6 @@ import org.navalplanner.business.resources.entities.Resource;
 public abstract class ResourceAllocation<T extends DayAssignment> extends
         BaseEntity {
 
-    public static class ResourceAllocationWithDesiredResourcesPerDay {
-
-        private final ResourceAllocation<?> resourceAllocation;
-
-        private final ResourcesPerDay resourcesPerDay;
-
-        public ResourceAllocationWithDesiredResourcesPerDay(
-                ResourceAllocation<?> resourceAllocation,
-                ResourcesPerDay resourcesPerDay) {
-            this.resourceAllocation = resourceAllocation;
-            this.resourcesPerDay = resourcesPerDay;
-        }
-
-        public ResourceAllocation<?> getResourceAllocation() {
-            return resourceAllocation;
-        }
-
-        public ResourcesPerDay getResourcesPerDay() {
-            return resourcesPerDay;
-        }
-    }
-
     public static AllocationsCurried allocating(
             List<ResourceAllocationWithDesiredResourcesPerDay> resourceAllocations) {
         return new AllocationsCurried(resourceAllocations);
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocatorForTaskDurationAndSpecifiedResourcesPerDay.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocatorForTaskDurationAndSpecifiedResourcesPerDay.java
index 14a898d62..537978968 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocatorForTaskDurationAndSpecifiedResourcesPerDay.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocatorForTaskDurationAndSpecifiedResourcesPerDay.java
@@ -6,7 +6,6 @@ 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.ResourceAllocation.ResourceAllocationWithDesiredResourcesPerDay;
 import org.navalplanner.business.resources.entities.Resource;
 
 public class AllocatorForTaskDurationAndSpecifiedResourcesPerDay {
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
new file mode 100644
index 000000000..18a351d71
--- /dev/null
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java
@@ -0,0 +1,26 @@
+package org.navalplanner.business.planner.entities.allocationalgorithms;
+
+import org.navalplanner.business.planner.entities.ResourceAllocation;
+import org.navalplanner.business.planner.entities.ResourcesPerDay;
+
+public class ResourceAllocationWithDesiredResourcesPerDay {
+
+    private final ResourceAllocation<?> resourceAllocation;
+
+    private final ResourcesPerDay resourcesPerDay;
+
+    public ResourceAllocationWithDesiredResourcesPerDay(
+            ResourceAllocation<?> resourceAllocation,
+            ResourcesPerDay resourcesPerDay) {
+        this.resourceAllocation = resourceAllocation;
+        this.resourcesPerDay = resourcesPerDay;
+    }
+
+    public ResourceAllocation<?> getResourceAllocation() {
+        return resourceAllocation;
+    }
+
+    public ResourcesPerDay getResourcesPerDay() {
+        return resourcesPerDay;
+    }
+}
\ No newline at end of file
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 3170295ca..08c8cbc3e 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
@@ -18,7 +18,7 @@ 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.ResourceAllocation.ResourceAllocationWithDesiredResourcesPerDay;
+import org.navalplanner.business.planner.entities.allocationalgorithms.ResourceAllocationWithDesiredResourcesPerDay;
 import org.navalplanner.business.resources.entities.Resource;
 import org.navalplanner.business.resources.entities.Worker;
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
index c99b73b74..5e64cefa4 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
@@ -18,7 +18,7 @@ import org.navalplanner.business.planner.entities.GenericResourceAllocation;
 import org.navalplanner.business.planner.entities.ResourceAllocation;
 import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
 import org.navalplanner.business.planner.entities.Task;
-import org.navalplanner.business.planner.entities.ResourceAllocation.ResourceAllocationWithDesiredResourcesPerDay;
+import org.navalplanner.business.planner.entities.allocationalgorithms.ResourceAllocationWithDesiredResourcesPerDay;
 import org.navalplanner.business.resources.daos.IResourceDAO;
 import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.resources.entities.CriterionSatisfaction;