From 68ca6ad686f5656be1bceaf68ee7a44c44ce45bb Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Thu, 28 Jan 2010 10:03:23 +0100
Subject: [PATCH]  ItEr45S23CUImportacionTiposEtiquetasEEtiquetas: Added code
 field to Label and LabelType, making them inherit from IntegrationEntity.

---
 .../navalplanner/business/labels/daos/ILabelDAO.java  |  4 ++--
 .../business/labels/daos/ILabelTypeDAO.java           |  4 ++--
 .../navalplanner/business/labels/daos/LabelDAO.java   |  5 ++---
 .../business/labels/daos/LabelTypeDAO.java            |  4 ++--
 .../navalplanner/business/labels/entities/Label.java  | 11 +++++++++--
 .../business/labels/entities/LabelType.java           | 11 +++++++++--
 .../business/labels/entities/Labels.hbm.xml           |  2 ++
 7 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/ILabelDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/ILabelDAO.java
index 943d307a0..fc8a18aef 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/ILabelDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/ILabelDAO.java
@@ -22,14 +22,14 @@ package org.navalplanner.business.labels.daos;
 
 import java.util.List;
 
-import org.navalplanner.business.common.daos.IGenericDAO;
+import org.navalplanner.business.common.daos.IIntegrationEntityDAO;
 import org.navalplanner.business.labels.entities.Label;
 import org.navalplanner.business.labels.entities.LabelType;
 
 /**
  * @author Diego Pino Garcia <dpino@igalia.com>
  */
-public interface ILabelDAO extends IGenericDAO<Label, Long> {
+public interface ILabelDAO extends IIntegrationEntityDAO<Label> {
 
     List<Label> getAll();
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/ILabelTypeDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/ILabelTypeDAO.java
index 12aa3a981..2679d9171 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/ILabelTypeDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/ILabelTypeDAO.java
@@ -23,14 +23,14 @@ package org.navalplanner.business.labels.daos;
 import java.util.List;
 
 import org.hibernate.NonUniqueResultException;
-import org.navalplanner.business.common.daos.IGenericDAO;
+import org.navalplanner.business.common.daos.IIntegrationEntityDAO;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.labels.entities.LabelType;
 
 /**
  * @author Diego Pino Garcia <dpino@igalia.com>
  */
-public interface ILabelTypeDAO extends IGenericDAO<LabelType, Long> {
+public interface ILabelTypeDAO extends IIntegrationEntityDAO<LabelType> {
 
     List<LabelType> getAll();
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/LabelDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/LabelDAO.java
index 2cff202eb..39e85308e 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/LabelDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/LabelDAO.java
@@ -24,7 +24,7 @@ import java.util.List;
 
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
-import org.navalplanner.business.common.daos.GenericDAOHibernate;
+import org.navalplanner.business.common.daos.IntegrationEntityDAO;
 import org.navalplanner.business.labels.entities.Label;
 import org.navalplanner.business.labels.entities.LabelType;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -38,8 +38,7 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 @Scope(BeanDefinition.SCOPE_SINGLETON)
-public class LabelDAO extends GenericDAOHibernate<Label, Long> implements
-        ILabelDAO {
+public class LabelDAO extends IntegrationEntityDAO<Label> implements ILabelDAO {
 
     @Override
     public List<Label> getAll() {
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/LabelTypeDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/LabelTypeDAO.java
index 99254ef80..859ce732c 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/LabelTypeDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/LabelTypeDAO.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang.Validate;
 import org.hibernate.Criteria;
 import org.hibernate.NonUniqueResultException;
 import org.hibernate.criterion.Restrictions;
-import org.navalplanner.business.common.daos.GenericDAOHibernate;
+import org.navalplanner.business.common.daos.IntegrationEntityDAO;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.labels.entities.LabelType;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Repository
 @Scope(BeanDefinition.SCOPE_SINGLETON)
-public class LabelTypeDAO extends GenericDAOHibernate<LabelType, Long> implements
+public class LabelTypeDAO extends IntegrationEntityDAO<LabelType> implements
         ILabelTypeDAO {
 
     @Override
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/labels/entities/Label.java b/navalplanner-business/src/main/java/org/navalplanner/business/labels/entities/Label.java
index cd30272dc..2b32a4bd0 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/labels/entities/Label.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/labels/entities/Label.java
@@ -27,7 +27,9 @@ import java.util.Set;
 import org.apache.commons.lang.Validate;
 import org.hibernate.validator.NotEmpty;
 import org.hibernate.validator.NotNull;
-import org.navalplanner.business.common.BaseEntity;
+import org.navalplanner.business.common.IntegrationEntity;
+import org.navalplanner.business.common.Registry;
+import org.navalplanner.business.labels.daos.ILabelDAO;
 import org.navalplanner.business.orders.entities.OrderElement;
 
 /**
@@ -36,7 +38,7 @@ import org.navalplanner.business.orders.entities.OrderElement;
  * @author Diego Pino Garcia<dpino@igalia.com>
  *
  */
-public class Label extends BaseEntity {
+public class Label extends IntegrationEntity {
 
     @NotEmpty(message = "name not specified")
     private String name;
@@ -104,4 +106,9 @@ public class Label extends BaseEntity {
         return name;
     }
 
+    @Override
+    protected ILabelDAO getIntegrationEntityDAO() {
+        return Registry.getLabelDAO();
+    }
+
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/labels/entities/LabelType.java b/navalplanner-business/src/main/java/org/navalplanner/business/labels/entities/LabelType.java
index 853effc88..ba8eda478 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/labels/entities/LabelType.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/labels/entities/LabelType.java
@@ -26,7 +26,9 @@ import java.util.Set;
 
 import org.apache.commons.lang.Validate;
 import org.hibernate.validator.NotEmpty;
-import org.navalplanner.business.common.BaseEntity;
+import org.navalplanner.business.common.IntegrationEntity;
+import org.navalplanner.business.common.Registry;
+import org.navalplanner.business.labels.daos.ILabelTypeDAO;
 
 /**
  * LabeType entity
@@ -34,7 +36,7 @@ import org.navalplanner.business.common.BaseEntity;
  * @author Diego Pino Garcia<dpino@igalia.com>
  *
  */
-public class LabelType extends BaseEntity implements Comparable {
+public class LabelType extends IntegrationEntity implements Comparable {
 
     @NotEmpty(message = "name not specified")
     private String name;
@@ -83,4 +85,9 @@ public class LabelType extends BaseEntity implements Comparable {
         }
         return -1;
     }
+
+    @Override
+    protected ILabelTypeDAO getIntegrationEntityDAO() {
+        return Registry.getLabelTypeDAO();
+    }
 }
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml
index 39fc3bafd..69218199d 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml
@@ -11,6 +11,7 @@
     </id>
     <version name="version" access="property" type="long" />
 
+    <property name="code" access="property" not-null="true" unique="true"/>
 	<properties name="nameAndType" unique="true">
 		<property name="name" />
 		<many-to-one name="type" class="LabelType" column="LABEL_TYPE_ID" />
@@ -31,6 +32,7 @@
     </id>
     <version name="version" access="property" type="long" />
 
+    <property name="code" access="property" not-null="true" unique="true"/>
     <property name="name" unique="true"/>
 
     <set name="labels" inverse="false" cascade="all">