From 685f2a5feb62326851f4f89beb6e1546c6bc5bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 7 Jan 2010 20:48:19 +0100 Subject: [PATCH] ItEr42S17CUGravacionModelosUnidadesTraballoItEr41S20: Converting MaterialAssignmentsComponent into a superclass --- .../web/orders/OrderCRUDController.java | 4 +-- .../web/orders/OrderElementController.java | 4 +-- .../MaterialAssignmentsComponent.java | 8 ++--- ...erElementMaterialAssignmentsComponent.java | 36 +++++++++++++++++++ .../main/webapp/orders/_editOrderElement.zul | 3 +- .../src/main/webapp/orders/_edition.zul | 3 +- 6 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/OrderElementMaterialAssignmentsComponent.java diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java index d79136cb2..b5c27c9e5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java @@ -42,7 +42,7 @@ import org.navalplanner.web.common.MessagesForUser; import org.navalplanner.web.common.OnlyOneVisible; import org.navalplanner.web.common.Util; import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController; -import org.navalplanner.web.orders.materials.MaterialAssignmentsComponent; +import org.navalplanner.web.orders.materials.OrderElementMaterialAssignmentsComponent; import org.navalplanner.web.planner.order.IOrderPlanningGate; import org.navalplanner.web.tree.TreeComponent; import org.navalplanner.web.users.OrderAuthorizationController; @@ -231,7 +231,7 @@ public class OrderCRUDController extends GenericForwardComposer { private void setupAssignedMaterialsToOrderElementController( Component comp) throws Exception { - MaterialAssignmentsComponent assignmentsComponent = (MaterialAssignmentsComponent) editWindow + OrderElementMaterialAssignmentsComponent assignmentsComponent = (OrderElementMaterialAssignmentsComponent) editWindow .getFellowIfAny("orderElementMaterials"); assignedMaterialsController = assignmentsComponent.getController(); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java index 328d9430f..f9f21976d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java @@ -26,7 +26,7 @@ import org.navalplanner.business.orders.entities.OrderLine; import org.navalplanner.business.orders.entities.OrderLineGroup; import org.navalplanner.web.common.Util; import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController; -import org.navalplanner.web.orders.materials.MaterialAssignmentsComponent; +import org.navalplanner.web.orders.materials.OrderElementMaterialAssignmentsComponent; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.SuspendNotAllowedException; import org.zkoss.zk.ui.event.Event; @@ -116,7 +116,7 @@ public class OrderElementController extends GenericForwardComposer { private void setupAssignedMaterialsToOrderElementController(Component comp) throws Exception { - MaterialAssignmentsComponent assignedMaterialsComponent = (MaterialAssignmentsComponent) comp + OrderElementMaterialAssignmentsComponent assignedMaterialsComponent = (OrderElementMaterialAssignmentsComponent) comp .getFellowIfAny("orderElementMaterials"); assignedMaterialsController = assignedMaterialsComponent .getController(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/MaterialAssignmentsComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/MaterialAssignmentsComponent.java index bde331bd2..76e0b191d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/MaterialAssignmentsComponent.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/MaterialAssignmentsComponent.java @@ -25,12 +25,8 @@ import org.zkoss.zk.ui.HtmlMacroComponent; * @author Óscar González Fernández * */ -public class MaterialAssignmentsComponent extends HtmlMacroComponent { +public abstract class MaterialAssignmentsComponent extends HtmlMacroComponent { - private AssignedMaterialsToOrderElementController controller = new AssignedMaterialsToOrderElementController(); - - public AssignedMaterialsToOrderElementController getController() { - return controller; - } + public abstract AssignedMaterialsController getController(); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/OrderElementMaterialAssignmentsComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/OrderElementMaterialAssignmentsComponent.java new file mode 100644 index 000000000..22e94805a --- /dev/null +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/OrderElementMaterialAssignmentsComponent.java @@ -0,0 +1,36 @@ +/* + * This file is part of ###PROJECT_NAME### + * + * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e + * Desenvolvemento Tecnolóxico de Galicia + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.navalplanner.web.orders.materials; + +/** + * @author Óscar González Fernández + * + */ +public class OrderElementMaterialAssignmentsComponent extends + MaterialAssignmentsComponent { + + private AssignedMaterialsToOrderElementController controller = new AssignedMaterialsToOrderElementController(); + + @Override + public AssignedMaterialsToOrderElementController getController() { + return controller; + } + +} diff --git a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul index c8c707788..f158dd8a0 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul @@ -23,7 +23,8 @@ - + - +