From 09ff77f83b3ac0d037fe22afcbca4ba05e9bba64 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 7 Oct 2011 15:59:01 +0200
Subject: [PATCH] [Bug #1208] Rename calculateLimitDate functions to prevent
 future confusions

FEA: ItEr75S04BugFixing
---
 .../web/planner/TaskElementAdapter.java           | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
index 3bc0ebb7e..10cc4bf98 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
@@ -509,9 +509,10 @@ public class TaskElementAdapter {
 
                 GanttDate result = null;
                 if (!(taskElement instanceof TaskGroup)) {
-                    result = calculateLimitDate(assignedEffort
+                    result = calculateLimitDateByHours(assignedEffort
                             .toHoursAsDecimalWithScale(2).intValue());
                 }
+
                 if (result == null) {
                     Integer hours = taskElement.getSumOfHoursAllocated();
 
@@ -524,7 +525,7 @@ public class TaskElementAdapter {
                     BigDecimal percentage = assignedEffort
                             .toHoursAsDecimalWithScale(2).divide(
                                     new BigDecimal(hours));
-                    result = calculateLimitDate(percentage);
+                    result = calculateLimitDateByPercentage(percentage);
 
                 }
 
@@ -612,20 +613,20 @@ public class TaskElementAdapter {
                 }
 
                 if (taskElement instanceof TaskGroup) {
-                    return calculateLimitDate(advancePercentage);
+                    return calculateLimitDateByPercentage(advancePercentage);
                 }
 
                 // Calculate date according to advanceHours or advancePercentage
                 final Integer advanceHours = advancePercentage.multiply(
                         new BigDecimal(hours)).intValue();
-                GanttDate result = calculateLimitDate(advanceHours);
+                GanttDate result = calculateLimitDateByHours(advanceHours);
                 if (result == null) {
-                    result = calculateLimitDate(advancePercentage);
+                    result = calculateLimitDateByPercentage(advancePercentage);
                 }
                 return result;
             }
 
-            private GanttDate calculateLimitDate(BigDecimal advancePercentage) {
+            private GanttDate calculateLimitDateByPercentage(BigDecimal advancePercentage) {
                 BaseCalendar calendar = taskElement.getCalendar();
                 if (advancePercentage.compareTo(BigDecimal.ZERO) == 0
                         || calendar == null) {
@@ -678,7 +679,7 @@ public class TaskElementAdapter {
                 return toGantt(end);
             }
 
-            private GanttDate calculateLimitDate(Integer hours) {
+            private GanttDate calculateLimitDateByHours(Integer hours) {
                 if (hours == null || hours == 0) {
                     return null;
                 }