From cd37765f1553e772bbf2869a08db25664def64e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 12 Jan 2010 16:09:32 +0100 Subject: [PATCH] ItEr43S12CUGravacionModelosUnidadesTraballoItEr42S17: Moving labels assignment classes to its own package --- .../java/org/navalplanner/web/orders/OrderCRUDController.java | 1 + .../org/navalplanner/web/orders/OrderElementController.java | 1 + .../{ => labels}/AssignedLabelsToOrderElementController.java | 4 +++- .../{ => labels}/AssignedLabelsToOrderElementModel.java | 3 ++- .../{ => labels}/IAssignedLabelsToOrderElementModel.java | 3 ++- .../web/orders/labels/LabelsAssignmentComponent.java | 1 - 6 files changed, 9 insertions(+), 4 deletions(-) rename navalplanner-webapp/src/main/java/org/navalplanner/web/orders/{ => labels}/AssignedLabelsToOrderElementController.java (97%) rename navalplanner-webapp/src/main/java/org/navalplanner/web/orders/{ => labels}/AssignedLabelsToOrderElementModel.java (98%) rename navalplanner-webapp/src/main/java/org/navalplanner/web/orders/{ => labels}/IAssignedLabelsToOrderElementModel.java (96%) 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 b3d80dd94..5d5cb8570 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 @@ -43,6 +43,7 @@ import org.navalplanner.web.common.Level; import org.navalplanner.web.common.MessagesForUser; import org.navalplanner.web.common.OnlyOneVisible; import org.navalplanner.web.common.Util; +import org.navalplanner.web.orders.labels.AssignedLabelsToOrderElementController; import org.navalplanner.web.orders.labels.LabelsAssignmentComponent; import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController; import org.navalplanner.web.orders.materials.OrderElementMaterialAssignmentsComponent; 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 22b0573fa..cb0cd11cc 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 @@ -25,6 +25,7 @@ import org.navalplanner.business.orders.entities.OrderElement; 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.labels.AssignedLabelsToOrderElementController; import org.navalplanner.web.orders.labels.LabelsAssignmentComponent; import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController; import org.navalplanner.web.orders.materials.OrderElementMaterialAssignmentsComponent; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsToOrderElementController.java similarity index 97% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java rename to navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsToOrderElementController.java index be9d68c98..03bdd69e4 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsToOrderElementController.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package org.navalplanner.web.orders; +package org.navalplanner.web.orders.labels; import static org.navalplanner.web.I18nHelper._; @@ -30,6 +30,8 @@ import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.web.common.Util; import org.navalplanner.web.common.components.Autocomplete; import org.navalplanner.web.common.components.bandboxsearch.BandboxSearch; +import org.navalplanner.web.orders.IOrderElementModel; +import org.navalplanner.web.orders.IOrderModel; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.ui.util.GenericForwardComposer; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsToOrderElementModel.java similarity index 98% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java rename to navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsToOrderElementModel.java index 1583d0530..ae74938dd 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsToOrderElementModel.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package org.navalplanner.web.orders; +package org.navalplanner.web.orders.labels; import java.util.ArrayList; import java.util.Collection; @@ -31,6 +31,7 @@ import org.navalplanner.business.labels.entities.LabelType; import org.navalplanner.business.orders.daos.IOrderElementDAO; import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.business.orders.entities.OrderLineGroup; +import org.navalplanner.web.orders.IOrderModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedLabelsToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/IAssignedLabelsToOrderElementModel.java similarity index 96% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedLabelsToOrderElementModel.java rename to navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/IAssignedLabelsToOrderElementModel.java index 8eb9c5461..3e9e0c551 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedLabelsToOrderElementModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/IAssignedLabelsToOrderElementModel.java @@ -18,13 +18,14 @@ * along with this program. If not, see . */ -package org.navalplanner.web.orders; +package org.navalplanner.web.orders.labels; import java.util.List; import org.navalplanner.business.labels.entities.Label; import org.navalplanner.business.labels.entities.LabelType; import org.navalplanner.business.orders.entities.OrderElement; +import org.navalplanner.web.orders.IOrderModel; /** * @author Diego Pino Garcia diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/LabelsAssignmentComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/LabelsAssignmentComponent.java index c0eb889ac..866271ae0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/LabelsAssignmentComponent.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/LabelsAssignmentComponent.java @@ -19,7 +19,6 @@ */ package org.navalplanner.web.orders.labels; -import org.navalplanner.web.orders.AssignedLabelsToOrderElementController; import org.zkoss.zk.ui.HtmlMacroComponent; /**