From f975a8a112f8e624dd699378c5fba7b8ae66fb51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 24 Jan 2011 20:41:42 +0100 Subject: [PATCH] Extract method in order to encapsulate the rule in one place FEA: ItEr69S08AdvanceAllocationFix --- .../AdvancedAllocationController.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 1b3b9e151..b12d0edd1 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 @@ -1510,17 +1510,19 @@ class Row { } Component hoursOnInterval(DetailItem item) { - Component result = - isGroupingRow() || isBeforeTaskStartDate(item) || - isBeforeLatestConsolidation(item) ? - new Label() : - disableIfNeeded(item, noNegativeIntbox()); + Component result = cannotBeEdited(item) ? new Label() + : disableIfNeeded(item, noNegativeIntbox()); reloadHoursOnInterval(result, item); componentsByDetailItem.put(item, result); addListenerIfNeeded(item, result); return result; } + private boolean cannotBeEdited(DetailItem item) { + return isGroupingRow() || isBeforeTaskStartDate(item) || + isBeforeLatestConsolidation(item); + } + private Intbox disableIfNeeded(DetailItem item, Intbox intBox) { intBox.setDisabled(restriction.isDisabledEditionOn(item)); return intBox; @@ -1534,8 +1536,7 @@ class Row { private void addListenerIfNeeded(final DetailItem item, final Component component) { - if (isGroupingRow() || isBeforeTaskStartDate(item) || - isBeforeLatestConsolidation(item)) { + if (cannotBeEdited(item)) { return; } final Intbox intbox = (Intbox) component; @@ -1559,8 +1560,7 @@ class Row { } private void reloadHoursOnInterval(Component component, DetailItem item) { - if (isGroupingRow() || isBeforeTaskStartDate(item) - || isBeforeLatestConsolidation(item)) { + if (cannotBeEdited(item)) { Label label = (Label) component; label.setValue(getHoursForDetailItem(item) + ""); label.setClass(getLabelClassFor(item));