From 79a7f7bb1e23ed2ab3c3fb3e77bd150ba7f2b763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 23 Nov 2009 18:25:38 +0100
Subject: [PATCH] ItEr36S11CUCreacionUnidadesPlanificacionItEr35S12: Removing
 use of general create method of AllocationBeingModified

---
 .../AllocationBeingModified.java              | 14 -----------
 .../AllocationUntilFillingHoursTest.java      | 24 ++++++++++---------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocationBeingModified.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocationBeingModified.java
index ca641731a..1f3e0995b 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocationBeingModified.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocationBeingModified.java
@@ -88,20 +88,6 @@ public abstract class AllocationBeingModified {
         }
     }
 
-    public static AllocationBeingModified create(
-            ResourceAllocation<?> resourceAllocation,
-            ResourcesPerDay resourcesPerDay,
-            Collection<? extends Resource> resources) {
-        if (resourceAllocation instanceof GenericResourceAllocation) {
-            GenericResourceAllocation generic = (GenericResourceAllocation) resourceAllocation;
-            return create(generic, resourcesPerDay, resources);
-
-        } else {
-            SpecificResourceAllocation specific = (SpecificResourceAllocation) resourceAllocation;
-            return create(specific, resourcesPerDay);
-        }
-    }
-
     public static AllocationBeingModified create(
             GenericResourceAllocation resourceAllocation,
             ResourcesPerDay resourcesPerDay, List<Resource> resources) {
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 0d2757fc3..798a00c3c 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
@@ -29,7 +29,6 @@ import static org.navalplanner.business.test.planner.entities.DayAssignmentMatch
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.joda.time.LocalDate;
@@ -179,7 +178,8 @@ public class AllocationUntilFillingHoursTest {
         for (ResourcesPerDay resourcesPerDay : specifiedResourcesPerDay) {
             SpecificResourceAllocation allocation = createSpecificResourceAllocationFor(
                     task, worker);
-            allocations.add(AllocationBeingModified.create(allocation, resourcesPerDay, Arrays.asList(worker)));
+            allocations.add(AllocationBeingModified.create(allocation,
+                    resourcesPerDay));
         }
     }
 
@@ -204,25 +204,27 @@ public class AllocationUntilFillingHoursTest {
 
     private void givenAllocationsWithoutTask() {
         allocations.add(AllocationBeingModified.create(
-                createStubAllocationReturning(SpecificResourceAllocation.class,
-                        null), ResourcesPerDay.amount(2), resources));
+                (SpecificResourceAllocation)
+ createStubAllocationReturning(
+                        SpecificResourceAllocation.class, null),
+                ResourcesPerDay.amount(2)));
         allocations.add(AllocationBeingModified.create(
                 createStubAllocationReturning(SpecificResourceAllocation.class,
-                        null), ResourcesPerDay.amount(2), resources));
+                        null), ResourcesPerDay.amount(2)));
     }
 
     private void givenAllocationsBelongingToDifferentTasks() {
         Task task = createStubTask();
         allocations.add(AllocationBeingModified.create(
                 createStubAllocationReturning(SpecificResourceAllocation.class,
-                        task), ResourcesPerDay.amount(2), resources));
+                        task), ResourcesPerDay.amount(2)));
         allocations.add(AllocationBeingModified.create(
                 createStubAllocationReturning(SpecificResourceAllocation.class,
-                        task), ResourcesPerDay.amount(2), resources));
+                        task), ResourcesPerDay.amount(2)));
         Task other = createStubTask();
         allocations.add(AllocationBeingModified.create(
                 createStubAllocationReturning(SpecificResourceAllocation.class,
-                        other), ResourcesPerDay.amount(2), resources));
+                        other), ResourcesPerDay.amount(2)));
     }
 
     private Task createStubTask() {
@@ -245,9 +247,9 @@ public class AllocationUntilFillingHoursTest {
         return result;
     }
 
-    private ResourceAllocation<?> createStubAllocationReturning(
-            Class<? extends ResourceAllocation<?>> allocationClass, Task task) {
-        ResourceAllocation<?> resourceAllocation = createNiceMock(allocationClass);
+    private <T extends ResourceAllocation<?>> T createStubAllocationReturning(
+            Class<T> allocationClass, Task task) {
+        T resourceAllocation = createNiceMock(allocationClass);
         expect(resourceAllocation.getTask()).andReturn(task).anyTimes();
         replay(resourceAllocation);
         return resourceAllocation;