From ecece6fd031544c428e80c788aa67cce106cc052 Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Wed, 6 Apr 2011 18:36:59 +0200 Subject: [PATCH] [Bug #931] Rename method FEA: ItEr74S04BugFixing --- .../business/costcategories/entities/CostCategory.java | 2 +- .../org/navalplanner/business/resources/entities/Resource.java | 2 +- .../ResourcesCostCategoryAssignmentController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java index f7ed34315..6dfa5c1ff 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java @@ -143,7 +143,7 @@ public class CostCategory extends IntegrationEntity { } } - public static void checkOverlapping( + public static void validateCostCategoryOverlapping( List costCategoryAssignments) { for (int i = 0; i < costCategoryAssignments.size(); i++) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java index b6ad16fa7..845482f7f 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java @@ -1095,7 +1095,7 @@ public abstract class Resource extends IntegrationEntity { assignmentsList.addAll(getResourcesCostCategoryAssignments()); try { - CostCategory.checkOverlapping(assignmentsList); + CostCategory.validateCostCategoryOverlapping(assignmentsList); } catch (ValidationException e) { return true; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java index 3cd8e31fa..3609788bf 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java @@ -332,7 +332,7 @@ public class ResourcesCostCategoryAssignmentController extends GenericForwardCom List costCategoryAssignments = resourcesCostCategoryAssignmentModel .getCostCategoryAssignments(); try { - CostCategory.checkOverlapping(costCategoryAssignments); + CostCategory.validateCostCategoryOverlapping(costCategoryAssignments); } catch (ValidationException e) { InvalidValue invalidValue = e.getInvalidValue(); Component comp = ComponentsFinder.findRowByValue(