From 54887acb45a63f0d90e5882acfd67545ff42b11c Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 27 Jun 2012 08:33:29 +0200 Subject: [PATCH] Bug #1471: Create new method updateColumnsFor to include all similar calls FEA: ItEr76S04BugFixing --- .../web/orders/OrderElementTreeController.java | 8 ++------ .../web/templates/TemplatesTreeController.java | 4 +--- .../java/org/libreplan/web/tree/TreeController.java | 12 +++++++++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java index 25e43b3b6..7d320c678 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java @@ -410,9 +410,7 @@ public class OrderElementTreeController extends TreeController { IOrderElementModel model = orderModel .getOrderElementModel(currentOrderElement); orderElementController.openWindow(model); - updateNameFor(currentOrderElement); - updateHoursFor(currentOrderElement); - updateBudgetFor(currentOrderElement); + updateColumnsFor(currentOrderElement); } protected void addCodeCell(final OrderElement orderElement) { @@ -637,9 +635,7 @@ public class OrderElementTreeController extends TreeController { public void refreshRow(Treeitem item) { try { - getRenderer().updateNameFor((OrderElement) item.getValue()); - getRenderer().updateHoursFor((OrderElement) item.getValue()); - getRenderer().updateBudgetFor((OrderElement) item.getValue()); + getRenderer().updateColumnsFor((OrderElement) item.getValue()); getRenderer().render(item, item.getValue()); } catch (Exception e) { e.printStackTrace(); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java index 026b87ec1..1b38bbbc4 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java @@ -298,9 +298,7 @@ public class TemplatesTreeController extends try { OrderElementTemplate orderElement = (OrderElementTemplate) item .getValue(); - getRenderer().updateNameFor(orderElement); - getRenderer().updateHoursFor(orderElement); - getRenderer().updateBudgetFor(orderElement); + getRenderer().updateColumnsFor(orderElement); getRenderer().render(item, orderElement); } catch (Exception e) { e.printStackTrace(); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java index 8d0c9340e..718db04cd 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java @@ -849,7 +849,13 @@ public abstract class TreeController> extends }; } - public void updateBudgetFor(T element) { + public void updateColumnsFor(T element) { + updateNameFor(element); + updateHoursFor(element); + updateBudgetFor(element); + } + + private void updateBudgetFor(T element) { if (!readOnly && element.isLeaf()) { Decimalbox decimalbox = budgetDecimalboxByElement.get(element); decimalbox.invalidate(); @@ -857,7 +863,7 @@ public abstract class TreeController> extends } } - public void updateNameFor(T element) { + private void updateNameFor(T element) { if (!readOnly) { Textbox textbox = nameTextboxByElement.get(element); textbox.setValue(getNameHandler().getNameFor(element)); @@ -979,7 +985,7 @@ public abstract class TreeController> extends }; } - public void updateHoursFor(T element) { + private void updateHoursFor(T element) { if (!readOnly && element.isLeaf()) { Intbox boxHours = (Intbox) hoursIntBoxByElement.get(element); Treecell tc = (Treecell) boxHours.getParent();