diff --git a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java index eceb30c1f..f7373f95d 100644 --- a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java +++ b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java @@ -114,7 +114,7 @@ public class DataForPlanner { public void doAction( IContextWithPlannerTask context, ITaskFundamentalProperties task) { - taskEditForm.showEditFormFor(context.getRelativeTo(), + taskEditForm.init(context.getRelativeTo(), context.getTask()); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java index 94540847c..1ce376925 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java @@ -50,7 +50,7 @@ public class TaskEditFormComposer extends GenericForwardComposer { super.doAfterCompose(comp); } - public void showEditFormFor(Component openRelativeTo, Task task) { + public void init(Component openRelativeTo, Task task) { this.currentTask = task; this.taskDTO = toDTO(task); updateComponentValuesForTask(taskDTO); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java index 323e3519e..e998afc10 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java @@ -61,7 +61,7 @@ public class SubcontractController extends GenericForwardComposer { tabpanel = (Tabpanel) comp; } - public void showWindow(Task task, + public void init(Task task, IContextWithPlannerTask context) { this.context = context; subcontractModel.init(task, context.getTask()); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java index 9b0e72fd6..2833e4389 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java @@ -98,9 +98,9 @@ public class EditTaskController extends GenericForwardComposer { this.taskElement = taskElement; this.context = context; - taskPropertiesController.showEditFormFor(context, taskElement); + taskPropertiesController.init(context, taskElement); if (taskElement.isSubcontracted()) { - subcontractController.showWindow((Task) taskElement, context); + subcontractController.init((Task) taskElement, context); } try { @@ -156,7 +156,7 @@ public class EditTaskController extends GenericForwardComposer { if (subcontract) { resourceAllocationTab.setVisible(false); subcontractTab.setVisible(true); - subcontractController.showWindow((Task) taskElement, context); + subcontractController.init((Task) taskElement, context); } else { subcontractTab.setVisible(false); resourceAllocationTab.setVisible(true); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java index 082286b53..141f47fe1 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java @@ -162,11 +162,11 @@ public class TaskPropertiesController extends GenericForwardComposer { private Checkbox subcontractCheckbox; - public void showEditFormFor(IContextWithPlannerTask context, + public void init(IContextWithPlannerTask context, TaskElement taskElement) { this.currentContext = context; this.currentTaskElement = taskElement; - taskEditFormComposer.showEditFormFor(context.getRelativeTo(), context.getTask()); + taskEditFormComposer.init(context.getRelativeTo(), context.getTask()); updateComponentValuesForTask(); }