From 1131c504c693d0042ba403cd9a014ee7af15c0b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Thu, 16 Sep 2010 20:31:11 +0200
Subject: [PATCH] Remove resetGenericAssignments method

It was confusing since generic is a name also used in
GenericResourceAllocation and GenericDayAssignment.

FEA: ItEr60S19TimeUnitDataType
---
 .../planner/entities/ResourceAllocation.java  | 22 +++------------
 ...orForSpecifiedResourcesPerDayAndHours.java | 28 +++++++++++--------
 2 files changed, 21 insertions(+), 29 deletions(-)

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 07d6236a0..74d04e890 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
@@ -231,11 +231,10 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
                 }
 
                 @Override
-                protected void setNewDataForAllocation(
-                        ResourceAllocation<?> allocation, TaskDate end,
-                        ResourcesPerDay resourcesPerDay,
-                        List<DayAssignment> dayAssignments) {
-                    allocation.resetGenericAssignmentsTo(dayAssignments, end);
+                protected <T extends DayAssignment> void setNewDataForAllocation(
+                        ResourceAllocation<T> allocation, TaskDate end,
+                        ResourcesPerDay resourcesPerDay, List<T> dayAssignments) {
+                    allocation.resetAssignmentsTo(dayAssignments, end);
                     allocation.updateResourcesPerDay();
                 }
 
@@ -812,19 +811,6 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
     protected abstract ICalendar getCalendarGivenTaskCalendar(
             ICalendar taskCalendar);
 
-    private void resetGenericAssignmentsTo(List<DayAssignment> assignments,
-            TaskDate end) {
-        resetAssignmentsTo(cast(assignments), end);
-    }
-
-    private List<T> cast(List<DayAssignment> value) {
-        List<T> result = new ArrayList<T>();
-        for (DayAssignment dayAssignment : value) {
-            result.add(getDayAssignmentType().cast(dayAssignment));
-        }
-        return result;
-    }
-
     protected abstract Class<T> getDayAssignmentType();
 
     public ResourceAllocation<T> copy(Scenario scenario) {
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 803057154..233d8e63a 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
@@ -110,20 +110,26 @@ public abstract class AllocatorForSpecifiedResourcesPerDayAndHours {
     private void setAssignmentsForEachAllocation(TaskDate end) {
         for (Entry<ResourcesPerDayModification, List<DayAssignment>> entry : resultAssignments
                 .entrySet()) {
-            ResourceAllocation<?> allocation = entry.getKey()
-                    .getBeingModified();
-            ResourcesPerDay resourcesPerDay = entry.getKey()
-                    .getGoal();
-            List<DayAssignment> value = entry.getValue();
-            setNewDataForAllocation(allocation, end, resourcesPerDay,
-                    value);
+            setNewDataForAllocation(entry, end);
         }
     }
 
-    protected abstract void setNewDataForAllocation(
-            ResourceAllocation<?> allocation, TaskDate explicitEnd,
-            ResourcesPerDay resourcesPerDay,
-            List<DayAssignment> dayAssignments);
+    private <T extends DayAssignment> void setNewDataForAllocation(
+            Entry<ResourcesPerDayModification, List<DayAssignment>> entry,
+            TaskDate end) {
+        @SuppressWarnings("unchecked")
+        ResourceAllocation<T> allocation = (ResourceAllocation<T>) entry
+                .getKey().getBeingModified();
+        ResourcesPerDay resourcesPerDay = entry.getKey().getGoal();
+        @SuppressWarnings("unchecked")
+        List<T> value = (List<T>) entry.getValue();
+        setNewDataForAllocation(allocation, end, resourcesPerDay,
+                value);
+    }
+
+    protected abstract <T extends DayAssignment> void setNewDataForAllocation(
+            ResourceAllocation<T> allocation, TaskDate explicitEnd,
+            ResourcesPerDay resourcesPerDay, List<T> dayAssignments);
 
     protected abstract List<DayAssignment> createAssignmentsAtDay(
             ResourcesPerDayModification allocation, LocalDate day,