(no commit message)

diff --git a/.gitattributes b/.gitattributes
index 87790121ffd667d5ab33eef1f4572ee0b9871b1d..f313053bcdd9339a0a7964b4918dd869a53a48a7 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -435,11 +435,15 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/comm
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/FeatureDaoImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/FeatureTreeDaoImpl.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/NomenclaturalStatusDaoHibernateImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationHibernateImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occurrence/OccurrenceDaoHibernateImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/INomenclaturalStatusDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITypeDesignationDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/occurrence/IOccurrenceDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/reference/IReferenceDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonDao.java -text

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IReferencedEntityDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IReferencedEntityDao.java
index ef10c4ed9c52ded26b36deaa2a00aa094f516cc2..3e15a200c704940c6fcedbff46c63ce77231712d 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IReferencedEntityDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IReferencedEntityDao.java
@@ -6,15 +6,12 @@
 \r
 package eu.etaxonomy.cdm.persistence.dao.common;\r
 \r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
-import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 \r
 /**\r
  * @author a.babadshanjan\r
  * @created 04.09.2008\r
  */\r
-public interface IReferencedEntityDao extends ICdmEntityDao<ReferencedEntityBase> {\r
+public interface IReferencedEntityDao<T extends ReferencedEntityBase> extends ICdmEntityDao<T> {\r
 \r
 }\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java
index 5f1dd934f2bc46ee7ee837ebd96b34942515a4c3..ea81bb42a8c86197db7b9fcd19352c6531b9b267 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java
@@ -25,7 +25,7 @@ import static eu.etaxonomy.cdm.persistence.dao.common.ITitledDao.MATCH_MODE.*;
 
 
 public class IdentifiableDaoBase<T extends IdentifiableEntity> extends CdmEntityDaoBase<T> implements IIdentifiableDao<T>{
-       static Logger logger = Logger.getLogger(IdentifiableDaoBase.class);
+       private static final Logger logger = Logger.getLogger(IdentifiableDaoBase.class);
 
 
        public IdentifiableDaoBase(Class<T> type) {

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/ReferencedEntityDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/ReferencedEntityDaoImpl.java
index d8a903b607d4f81df9a3f657e20843ceffd5bc30..f352f78b42eddf649e6e2eb6934f48f56be659d3 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/ReferencedEntityDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/ReferencedEntityDaoImpl.java
@@ -6,26 +6,19 @@
 \r
 package eu.etaxonomy.cdm.persistence.dao.hibernate.common;\r
 \r
-import org.springframework.stereotype.Repository;\r
-\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
-import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IReferencedEntityDao;\r
-import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao;\r
 \r
 /**\r
  * @author a.babadshanjan\r
  * @created 05.09.2008\r
  */\r
-@Repository\r
-public class ReferencedEntityDaoImpl extends CdmEntityDaoBase<ReferencedEntityBase> \r
-implements IReferencedEntityDao\r
 \r
-{\r
-       public ReferencedEntityDaoImpl() {\r
-               super(ReferencedEntityBase.class);\r
+public class ReferencedEntityDaoImpl<T extends ReferencedEntityBase> extends CdmEntityDaoBase<T> \r
+                                                       implements IReferencedEntityDao<T>{\r
+       \r
+       public ReferencedEntityDaoImpl(Class<T> type) {\r
+               super(type);\r
        }\r
 \r
 }\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/NomenclaturalStatusDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/NomenclaturalStatusDaoHibernateImpl.java
new file mode 100644 (file)
index 0000000..c7e2442
--- /dev/null
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/NomenclaturalStatusDaoHibernateImpl.java
@@ -0,0 +1,42 @@
+/**\r
+ * Copyright (C) 2007 EDIT\r
+ * European Distributed Institute of Taxonomy \r
+ * http://www.e-taxonomy.eu\r
+ * \r
+ * The contents of this file are subject to the Mozilla Public License Version 1.1\r
+ * See LICENSE.TXT at the top of this package for the full license terms.\r
+ *\r
+ */\r
+package eu.etaxonomy.cdm.persistence.dao.hibernate.name;\r
+\r
+import java.util.List;\r
+\r
+import org.apache.log4j.Logger;\r
+import org.hibernate.Criteria;\r
+import org.springframework.stereotype.Repository;\r
+\r
+import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
+import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;\r
+import eu.etaxonomy.cdm.persistence.dao.hibernate.common.ReferencedEntityDaoImpl;\r
+import eu.etaxonomy.cdm.persistence.dao.name.INomenclaturalStatusDao;\r
+\r
+/**\r
+ * @author a.mueller\r
+ *\r
+ */\r
+@Repository\r
+public class NomenclaturalStatusDaoHibernateImpl \r
+                       extends ReferencedEntityDaoImpl<NomenclaturalStatus> implements INomenclaturalStatusDao {\r
+       private static final Logger logger = Logger.getLogger(NomenclaturalStatusDaoHibernateImpl.class);\r
+\r
+       public NomenclaturalStatusDaoHibernateImpl() {\r
+               super(NomenclaturalStatus.class); \r
+       }\r
+\r
+       public List<ReferencedEntityBase> getAllNomenclaturalStatus(Integer limit, Integer start) {\r
+               Criteria crit = getSession().createCriteria(NomenclaturalStatus.class);\r
+               List<ReferencedEntityBase> results = crit.list();\r
+               return results;\r
+       }\r
+\r
+}
\ No newline at end of file

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java
index a83f139c793ff8eef1137dc2f516a0069932fc5d..5c36de4be1feda918d1649d89f4f3aa057da70ca 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java
@@ -13,14 +13,11 @@ import java.util.List;
 \r
 import org.apache.log4j.Logger;\r
 import org.hibernate.Criteria;\r
-import org.hibernate.criterion.Restrictions;\r
 import org.springframework.stereotype.Repository;\r
 \r
 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
-import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.TypeDesignationBase;\r
-import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBase;\r
 import eu.etaxonomy.cdm.persistence.dao.name.ITaxonNameDao;\r
 \r
@@ -31,22 +28,10 @@ import eu.etaxonomy.cdm.persistence.dao.name.ITaxonNameDao;
 @Repository\r
 public class TaxonNameDaoHibernateImpl \r
                        extends IdentifiableDaoBase<TaxonNameBase> implements ITaxonNameDao {\r
-       static Logger logger = Logger.getLogger(TaxonNameDaoHibernateImpl.class);\r
+       private static final Logger logger = Logger.getLogger(TaxonNameDaoHibernateImpl.class);\r
 \r
        public TaxonNameDaoHibernateImpl() {\r
                super(TaxonNameBase.class); \r
        }\r
 \r
-       public List<ReferencedEntityBase> getAllNomenclaturalStatus(Integer limit, Integer start) {\r
-               Criteria crit = getSession().createCriteria(NomenclaturalStatus.class);\r
-               List<ReferencedEntityBase> results = crit.list();\r
-               return results;\r
-       }\r
-\r
-       public List<ReferencedEntityBase> getAllTypeDesignations(Integer limit, Integer start) {\r
-               Criteria crit = getSession().createCriteria(TypeDesignationBase.class);\r
-               List<ReferencedEntityBase> results = crit.list();\r
-               return results;\r
-       }\r
-\r
 }
\ No newline at end of file

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationHibernateImpl.java
new file mode 100644 (file)
index 0000000..afb7c1b
--- /dev/null
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationHibernateImpl.java
@@ -0,0 +1,42 @@
+/**\r
+ * Copyright (C) 2007 EDIT\r
+ * European Distributed Institute of Taxonomy \r
+ * http://www.e-taxonomy.eu\r
+ * \r
+ * The contents of this file are subject to the Mozilla Public License Version 1.1\r
+ * See LICENSE.TXT at the top of this package for the full license terms.\r
+ *\r
+ */\r
+package eu.etaxonomy.cdm.persistence.dao.hibernate.name;\r
+\r
+import java.util.List;\r
+\r
+import org.apache.log4j.Logger;\r
+import org.hibernate.Criteria;\r
+import org.springframework.stereotype.Repository;\r
+\r
+import eu.etaxonomy.cdm.model.name.TypeDesignationBase;\r
+import eu.etaxonomy.cdm.persistence.dao.hibernate.common.ReferencedEntityDaoImpl;\r
+import eu.etaxonomy.cdm.persistence.dao.name.ITypeDesignationDao;\r
+\r
+/**\r
+ * @author a.mueller\r
+ *\r
+ */\r
+@Repository\r
+public class TypeDesignationHibernateImpl<T extends TypeDesignationBase> \r
+                       extends ReferencedEntityDaoImpl<TypeDesignationBase> implements ITypeDesignationDao {\r
+       private static final Logger logger = Logger.getLogger(TypeDesignationHibernateImpl.class);\r
+\r
+       public TypeDesignationHibernateImpl() {\r
+               super(TypeDesignationBase.class); \r
+       }\r
+\r
+       //TODO limit start\r
+       public List<TypeDesignationBase> getAllTypeDesignations(Integer limit, Integer start) {\r
+               Criteria crit = getSession().createCriteria(TypeDesignationBase.class);\r
+               List<TypeDesignationBase> results = crit.list();\r
+               return results;\r
+       }\r
+\r
+}
\ No newline at end of file

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/INomenclaturalStatusDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/INomenclaturalStatusDao.java
new file mode 100644 (file)
index 0000000..1ad1b8b
--- /dev/null
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/INomenclaturalStatusDao.java
@@ -0,0 +1,26 @@
+/**\r
+* Copyright (C) 2007 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.cdm.persistence.dao.name;\r
+\r
+import java.util.List;\r
+\r
+import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
+import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;\r
+import eu.etaxonomy.cdm.persistence.dao.common.IReferencedEntityDao;\r
+\r
+/**\r
+ * @author a.mueller\r
+ *\r
+ */\r
+public interface INomenclaturalStatusDao extends IReferencedEntityDao<NomenclaturalStatus> {\r
+       \r
+       public List<ReferencedEntityBase> getAllNomenclaturalStatus(Integer limit, Integer start);\r
+\r
+\r
+}\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java
index 832335af735fba55be04e831c05fa9083e6bbcc5..a1568051a5387d7654529e8d1791a61b062c41ac 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java
@@ -8,14 +8,7 @@
 */\r
 package eu.etaxonomy.cdm.persistence.dao.name;\r
 \r
-import java.util.List;\r
-\r
-import org.hibernate.Criteria;\r
-\r
-import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
-import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.cdm.model.name.TypeDesignationBase;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IIdentifiableDao;\r
 \r
 /**\r
@@ -24,8 +17,5 @@ import eu.etaxonomy.cdm.persistence.dao.common.IIdentifiableDao;
  */\r
 public interface ITaxonNameDao extends IIdentifiableDao<TaxonNameBase> {\r
        \r
-       public List<ReferencedEntityBase> getAllNomenclaturalStatus(Integer limit, Integer start);\r
-\r
-       public List<ReferencedEntityBase> getAllTypeDesignations(Integer limit, Integer start);\r
 \r
 }\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITypeDesignationDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITypeDesignationDao.java
new file mode 100644 (file)
index 0000000..041e7f3
--- /dev/null
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITypeDesignationDao.java
@@ -0,0 +1,24 @@
+/**\r
+* Copyright (C) 2007 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.cdm.persistence.dao.name;\r
+\r
+import java.util.List;\r
+\r
+import eu.etaxonomy.cdm.model.name.TypeDesignationBase;\r
+import eu.etaxonomy.cdm.persistence.dao.common.IReferencedEntityDao;\r
+\r
+/**\r
+ * @author a.mueller\r
+ *\r
+ */\r
+public interface ITypeDesignationDao extends IReferencedEntityDao<TypeDesignationBase> {\r
+       \r
+       public List<TypeDesignationBase> getAllTypeDesignations(Integer limit, Integer start);\r
+\r
+}\r