From 12123b7f0e0d91761914ec05098e8da158d7a71b Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Wed, 13 Apr 2011 13:35:46 +0200 Subject: [PATCH] [Bug #974] Rename applyDefaultFunction() to applyOn() FEA: ItEr74S04BugFixing --- .../planner/allocation/AdvancedAllocationController.java | 6 +++--- .../allocation/IAssignmentFunctionConfiguration.java | 2 +- .../allocation/streches/StrechesFunctionConfiguration.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java index b09c5abb0..7d6f5032a 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java @@ -1253,7 +1253,7 @@ class Row { if (showConfirmChangeFunctionDialog() == Messagebox.YES) { IAssignmentFunctionConfiguration function = getSelectedFunction(); if (function != null) { - function.applyDefaultFunction(getAllocation()); + function.applyOn(getAllocation()); } } else { setPreviousValue(currentValue); @@ -1309,7 +1309,7 @@ class Row { } @Override - public void applyDefaultFunction( + public void applyOn( ResourceAllocation resourceAllocation) { resourceAllocation.setAssignmentFunction(null); reloadHours(); @@ -1413,7 +1413,7 @@ class Row { } @Override - public void applyDefaultFunction( + public void applyOn( ResourceAllocation resourceAllocation) { resourceAllocation.setAssignmentFunction(SigmoidFunction.create()); reloadHours(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IAssignmentFunctionConfiguration.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IAssignmentFunctionConfiguration.java index 3e77708fc..1d3420f81 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IAssignmentFunctionConfiguration.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IAssignmentFunctionConfiguration.java @@ -27,7 +27,7 @@ public interface IAssignmentFunctionConfiguration { public boolean isTargetedTo(AssignmentFunction function); - public void applyDefaultFunction( + public void applyOn( ResourceAllocation resourceAllocation); public String getName(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StrechesFunctionConfiguration.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StrechesFunctionConfiguration.java index 30d320b76..ee79fa2a9 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StrechesFunctionConfiguration.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StrechesFunctionConfiguration.java @@ -93,7 +93,7 @@ public abstract class StrechesFunctionConfiguration implements } @Override - public void applyDefaultFunction(ResourceAllocation resourceAllocation) { + public void applyOn(ResourceAllocation resourceAllocation) { StretchesFunction stretchesFunction = StretchesFunctionModel .createDefaultStretchesFunction(resourceAllocation.getTask() .getEndDate());