diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/EditTemplateWindowController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/EditTemplateWindowController.java index 79232d899..13bfa6c3d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/EditTemplateWindowController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/EditTemplateWindowController.java @@ -25,6 +25,7 @@ import org.navalplanner.web.templates.advances.AdvancesAssignmentComponent; import org.navalplanner.web.templates.labels.LabelsAssignmentToTemplateComponent; import org.navalplanner.web.templates.materials.MaterialAssignmentTemplateComponent; import org.navalplanner.web.templates.quality.QualityFormAssignerComponent; +import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.Window; @@ -87,28 +88,34 @@ public class EditTemplateWindowController extends GenericForwardComposer { Util.reloadBindings(editTemplateWindow); } + private T find(String id, Class type) { + return type.cast(editTemplateWindow.getFellow(id)); + } + private void bindAdvancesAssignment(OrderElementTemplate template) { - AdvancesAssignmentComponent component = (AdvancesAssignmentComponent) editTemplateWindow - .getFellow("advancesAssignment"); + AdvancesAssignmentComponent component = find( + "advancesAssignment", AdvancesAssignmentComponent.class); component.useModel(model, template); } private void bindOrderElementLabels(OrderElementTemplate template) { - LabelsAssignmentToTemplateComponent component = (LabelsAssignmentToTemplateComponent) editTemplateWindow - .getFellow("listOrderElementLabels"); + LabelsAssignmentToTemplateComponent component = find( + "listOrderElementLabels", + LabelsAssignmentToTemplateComponent.class); component.getController().setTemplate(template); component.getController().openWindow(model); } private void bindOrderElementMaterials(OrderElementTemplate template) { - MaterialAssignmentTemplateComponent component = (MaterialAssignmentTemplateComponent) editTemplateWindow - .getFellow("listOrderElementMaterials"); + MaterialAssignmentTemplateComponent component = find( + "listOrderElementMaterials", + MaterialAssignmentTemplateComponent.class); component.getController().openWindow(template); } private void bindAssignedQualityForms(OrderElementTemplate template) { - QualityFormAssignerComponent c = (QualityFormAssignerComponent) editTemplateWindow - .getFellow("assignedQualityForms"); + QualityFormAssignerComponent c = find("assignedQualityForms", + QualityFormAssignerComponent.class); c.useModel(model, template); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java index 7d851c38c..bf5e6ae4d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java @@ -97,27 +97,34 @@ public class OrderTemplatesController extends GenericForwardComposer implements show(editWindow); } + private T findAtEditWindow(String id, Class type) { + return type.cast(editWindow.getFellow(id)); + } + private void bindAdvancesComponentWithCurrentTemplate() { - AdvancesAssignmentComponent c = (AdvancesAssignmentComponent) editWindow - .getFellow("advancesAssignment"); + AdvancesAssignmentComponent c = findAtEditWindow("advancesAssignment", + AdvancesAssignmentComponent.class); c.useModel(model); } private void bindMaterialsControllerWithCurrentTemplate() { - MaterialAssignmentTemplateComponent materialsComponent = (MaterialAssignmentTemplateComponent) editWindow - .getFellow("listOrderElementMaterials"); - materialsComponent.getController().openWindow(model.getTemplate()); + MaterialAssignmentTemplateComponent c = findAtEditWindow( + "listOrderElementMaterials", + MaterialAssignmentTemplateComponent.class); + c.getController().openWindow(model.getTemplate()); } private void bindLabelsControllerWithCurrentTemplate() { - LabelsAssignmentToTemplateComponent labelsComponent = (LabelsAssignmentToTemplateComponent) editWindow - .getFellow("listOrderElementLabels"); - labelsComponent.getController().openWindow(model); + LabelsAssignmentToTemplateComponent c = findAtEditWindow( + "listOrderElementLabels", + LabelsAssignmentToTemplateComponent.class); + c.getController().openWindow(model); } private void bindQualityFormWithCurrentTemplate() { - QualityFormAssignerComponent c = (QualityFormAssignerComponent) editWindow - .getFellow("assignedQualityForms"); + QualityFormAssignerComponent c = findAtEditWindow( + "assignedQualityForms", + QualityFormAssignerComponent.class); c.useModel(model); }