From 61108a45a4e1a57a47ec10e6ebe9ee06f5ae4327 Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Thu, 3 Dec 2009 17:08:09 +0100 Subject: [PATCH] ItEr37S15CUAltaTipoParteDeTraballoItEr36S17 : Refactoring of the valueobject package name. --- .../business/workreports/entities/WorkReport.java | 2 +- .../business/workreports/entities/WorkReportType.java | 2 +- .../{ValueObjects => valueobjects}/DescriptionField.java | 2 +- .../{ValueObjects => valueobjects}/DescriptionValue.java | 2 +- .../business/workreports/entities/WorkReports.hbm.xml | 6 +++--- .../test/workreports/daos/AbstractWorkReportTest.java | 2 +- .../test/workreports/entities/WorkReportTypeTest.java | 2 +- .../navalplanner/web/workreports/IWorkReportTypeModel.java | 2 +- .../web/workreports/WorkReportTypeCRUDController.java | 2 +- .../navalplanner/web/workreports/WorkReportTypeModel.java | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename navalplanner-business/src/main/java/org/navalplanner/business/workreports/{ValueObjects => valueobjects}/DescriptionField.java (97%) rename navalplanner-business/src/main/java/org/navalplanner/business/workreports/{ValueObjects => valueobjects}/DescriptionValue.java (96%) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReport.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReport.java index 632647da4..d55c41de9 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReport.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReport.java @@ -29,7 +29,7 @@ import org.hibernate.validator.NotEmpty; import org.hibernate.validator.NotNull; import org.hibernate.validator.Valid; import org.navalplanner.business.common.BaseEntity; -import org.navalplanner.business.workreports.ValueObjects.DescriptionValue; +import org.navalplanner.business.workreports.valueobjects.DescriptionValue; /** * @author Diego Pino García diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportType.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportType.java index 8e854ce25..093d16d6b 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportType.java @@ -32,8 +32,8 @@ import org.hibernate.validator.Valid; import org.navalplanner.business.common.BaseEntity; import org.navalplanner.business.common.Registry; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; -import org.navalplanner.business.workreports.ValueObjects.DescriptionField; import org.navalplanner.business.workreports.daos.IWorkReportTypeDAO; +import org.navalplanner.business.workreports.valueobjects.DescriptionField; /** * @author Diego Pino García * @author Susana Montes Pedreira diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/ValueObjects/DescriptionField.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/valueobjects/DescriptionField.java similarity index 97% rename from navalplanner-business/src/main/java/org/navalplanner/business/workreports/ValueObjects/DescriptionField.java rename to navalplanner-business/src/main/java/org/navalplanner/business/workreports/valueobjects/DescriptionField.java index e80bc559c..91da68d43 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/ValueObjects/DescriptionField.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/valueobjects/DescriptionField.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package org.navalplanner.business.workreports.ValueObjects; +package org.navalplanner.business.workreports.valueobjects; import org.hibernate.validator.Min; import org.hibernate.validator.NotEmpty; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/ValueObjects/DescriptionValue.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/valueobjects/DescriptionValue.java similarity index 96% rename from navalplanner-business/src/main/java/org/navalplanner/business/workreports/ValueObjects/DescriptionValue.java rename to navalplanner-business/src/main/java/org/navalplanner/business/workreports/valueobjects/DescriptionValue.java index 70dc5efe2..3246588a9 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/ValueObjects/DescriptionValue.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/valueobjects/DescriptionValue.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package org.navalplanner.business.workreports.ValueObjects; +package org.navalplanner.business.workreports.valueobjects; /** * Value Object
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/workreports/entities/WorkReports.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/workreports/entities/WorkReports.hbm.xml index 63107508f..930ab7d62 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/workreports/entities/WorkReports.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/workreports/entities/WorkReports.hbm.xml @@ -30,7 +30,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/AbstractWorkReportTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/AbstractWorkReportTest.java index 94a216cae..47d0a2632 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/AbstractWorkReportTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/AbstractWorkReportTest.java @@ -35,12 +35,12 @@ import org.navalplanner.business.orders.entities.OrderLine; import org.navalplanner.business.resources.daos.IResourceDAO; import org.navalplanner.business.resources.entities.Resource; import org.navalplanner.business.resources.entities.Worker; -import org.navalplanner.business.workreports.ValueObjects.DescriptionField; import org.navalplanner.business.workreports.daos.IWorkReportTypeDAO; import org.navalplanner.business.workreports.entities.WorkReport; import org.navalplanner.business.workreports.entities.WorkReportLabelTypeAssigment; import org.navalplanner.business.workreports.entities.WorkReportLine; import org.navalplanner.business.workreports.entities.WorkReportType; +import org.navalplanner.business.workreports.valueobjects.DescriptionField; import org.springframework.beans.factory.annotation.Autowired; public abstract class AbstractWorkReportTest { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTypeTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTypeTest.java index 93867bace..ef7676296 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTypeTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTypeTest.java @@ -29,10 +29,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.test.workreports.daos.AbstractWorkReportTest; -import org.navalplanner.business.workreports.ValueObjects.DescriptionField; import org.navalplanner.business.workreports.daos.IWorkReportTypeDAO; import org.navalplanner.business.workreports.entities.WorkReportLabelTypeAssigment; import org.navalplanner.business.workreports.entities.WorkReportType; +import org.navalplanner.business.workreports.valueobjects.DescriptionField; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.test.context.ContextConfiguration; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportTypeModel.java index e7fe4de64..d649262ea 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportTypeModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportTypeModel.java @@ -28,11 +28,11 @@ import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.labels.entities.Label; import org.navalplanner.business.labels.entities.LabelType; import org.navalplanner.business.orders.entities.OrderElement; -import org.navalplanner.business.workreports.ValueObjects.DescriptionField; import org.navalplanner.business.workreports.entities.PositionInWorkReportEnum; import org.navalplanner.business.workreports.entities.WorkReport; import org.navalplanner.business.workreports.entities.WorkReportLabelTypeAssigment; import org.navalplanner.business.workreports.entities.WorkReportType; +import org.navalplanner.business.workreports.valueobjects.DescriptionField; /** * Contract for {@link WorkRerportType} diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java index 985e7a157..072398e9b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java @@ -29,11 +29,11 @@ import java.util.Set; import org.apache.commons.logging.LogFactory; import org.navalplanner.business.labels.entities.Label; import org.navalplanner.business.labels.entities.LabelType; -import org.navalplanner.business.workreports.ValueObjects.DescriptionField; import org.navalplanner.business.workreports.entities.HoursManagementEnum; import org.navalplanner.business.workreports.entities.PositionInWorkReportEnum; import org.navalplanner.business.workreports.entities.WorkReportLabelTypeAssigment; import org.navalplanner.business.workreports.entities.WorkReportType; +import org.navalplanner.business.workreports.valueobjects.DescriptionField; import org.navalplanner.web.common.IMessagesForUser; import org.navalplanner.web.common.Level; import org.navalplanner.web.common.MessagesForUser; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java index b067eb302..5b4a97880 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java @@ -36,13 +36,13 @@ import org.navalplanner.business.labels.daos.ILabelDAO; import org.navalplanner.business.labels.daos.ILabelTypeDAO; import org.navalplanner.business.labels.entities.Label; import org.navalplanner.business.labels.entities.LabelType; -import org.navalplanner.business.workreports.ValueObjects.DescriptionField; import org.navalplanner.business.workreports.daos.IWorkReportDAO; import org.navalplanner.business.workreports.daos.IWorkReportTypeDAO; import org.navalplanner.business.workreports.entities.PositionInWorkReportEnum; import org.navalplanner.business.workreports.entities.WorkReport; import org.navalplanner.business.workreports.entities.WorkReportLabelTypeAssigment; import org.navalplanner.business.workreports.entities.WorkReportType; +import org.navalplanner.business.workreports.valueobjects.DescriptionField; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope;