From: Andreas Müller Date: Sat, 6 Sep 2008 10:06:05 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 1.4.0~560 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/1660d7fa160b736aa0d937d35315d4ec3f302ad8 --- diff --git a/.gitattributes b/.gitattributes index 87790121ff..f313053bcd 100644 --- 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 ef10c4ed9c..3e15a200c7 100644 --- 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 @@ package eu.etaxonomy.cdm.persistence.dao.common; -import eu.etaxonomy.cdm.model.common.DefinedTermBase; -import eu.etaxonomy.cdm.model.common.IdentifiableEntity; import eu.etaxonomy.cdm.model.common.ReferencedEntityBase; -import eu.etaxonomy.cdm.model.common.TermVocabulary; /** * @author a.babadshanjan * @created 04.09.2008 */ -public interface IReferencedEntityDao extends ICdmEntityDao { +public interface IReferencedEntityDao extends ICdmEntityDao { } 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 5f1dd934f2..ea81bb42a8 100644 --- 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 extends CdmEntityDaoBase implements IIdentifiableDao{ - static Logger logger = Logger.getLogger(IdentifiableDaoBase.class); + private static final Logger logger = Logger.getLogger(IdentifiableDaoBase.class); public IdentifiableDaoBase(Class 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 d8a903b607..f352f78b42 100644 --- 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 @@ package eu.etaxonomy.cdm.persistence.dao.hibernate.common; -import org.springframework.stereotype.Repository; - -import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.ReferencedEntityBase; -import eu.etaxonomy.cdm.model.common.TermVocabulary; -import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao; import eu.etaxonomy.cdm.persistence.dao.common.IReferencedEntityDao; -import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao; /** * @author a.babadshanjan * @created 05.09.2008 */ -@Repository -public class ReferencedEntityDaoImpl extends CdmEntityDaoBase -implements IReferencedEntityDao -{ - public ReferencedEntityDaoImpl() { - super(ReferencedEntityBase.class); +public class ReferencedEntityDaoImpl extends CdmEntityDaoBase + implements IReferencedEntityDao{ + + public ReferencedEntityDaoImpl(Class type) { + super(type); } } 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 index 0000000000..c7e2442b2b --- /dev/null +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/NomenclaturalStatusDaoHibernateImpl.java @@ -0,0 +1,42 @@ +/** + * Copyright (C) 2007 EDIT + * European Distributed Institute of Taxonomy + * http://www.e-taxonomy.eu + * + * The contents of this file are subject to the Mozilla Public License Version 1.1 + * See LICENSE.TXT at the top of this package for the full license terms. + * + */ +package eu.etaxonomy.cdm.persistence.dao.hibernate.name; + +import java.util.List; + +import org.apache.log4j.Logger; +import org.hibernate.Criteria; +import org.springframework.stereotype.Repository; + +import eu.etaxonomy.cdm.model.common.ReferencedEntityBase; +import eu.etaxonomy.cdm.model.name.NomenclaturalStatus; +import eu.etaxonomy.cdm.persistence.dao.hibernate.common.ReferencedEntityDaoImpl; +import eu.etaxonomy.cdm.persistence.dao.name.INomenclaturalStatusDao; + +/** + * @author a.mueller + * + */ +@Repository +public class NomenclaturalStatusDaoHibernateImpl + extends ReferencedEntityDaoImpl implements INomenclaturalStatusDao { + private static final Logger logger = Logger.getLogger(NomenclaturalStatusDaoHibernateImpl.class); + + public NomenclaturalStatusDaoHibernateImpl() { + super(NomenclaturalStatus.class); + } + + public List getAllNomenclaturalStatus(Integer limit, Integer start) { + Criteria crit = getSession().createCriteria(NomenclaturalStatus.class); + List results = crit.list(); + return results; + } + +} \ 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 a83f139c79..5c36de4be1 100644 --- 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; import org.apache.log4j.Logger; import org.hibernate.Criteria; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Repository; import eu.etaxonomy.cdm.model.common.ReferencedEntityBase; -import eu.etaxonomy.cdm.model.name.NomenclaturalStatus; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.name.TypeDesignationBase; -import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBase; import eu.etaxonomy.cdm.persistence.dao.name.ITaxonNameDao; @@ -31,22 +28,10 @@ import eu.etaxonomy.cdm.persistence.dao.name.ITaxonNameDao; @Repository public class TaxonNameDaoHibernateImpl extends IdentifiableDaoBase implements ITaxonNameDao { - static Logger logger = Logger.getLogger(TaxonNameDaoHibernateImpl.class); + private static final Logger logger = Logger.getLogger(TaxonNameDaoHibernateImpl.class); public TaxonNameDaoHibernateImpl() { super(TaxonNameBase.class); } - public List getAllNomenclaturalStatus(Integer limit, Integer start) { - Criteria crit = getSession().createCriteria(NomenclaturalStatus.class); - List results = crit.list(); - return results; - } - - public List getAllTypeDesignations(Integer limit, Integer start) { - Criteria crit = getSession().createCriteria(TypeDesignationBase.class); - List results = crit.list(); - return results; - } - } \ 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 index 0000000000..afb7c1ba5f --- /dev/null +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationHibernateImpl.java @@ -0,0 +1,42 @@ +/** + * Copyright (C) 2007 EDIT + * European Distributed Institute of Taxonomy + * http://www.e-taxonomy.eu + * + * The contents of this file are subject to the Mozilla Public License Version 1.1 + * See LICENSE.TXT at the top of this package for the full license terms. + * + */ +package eu.etaxonomy.cdm.persistence.dao.hibernate.name; + +import java.util.List; + +import org.apache.log4j.Logger; +import org.hibernate.Criteria; +import org.springframework.stereotype.Repository; + +import eu.etaxonomy.cdm.model.name.TypeDesignationBase; +import eu.etaxonomy.cdm.persistence.dao.hibernate.common.ReferencedEntityDaoImpl; +import eu.etaxonomy.cdm.persistence.dao.name.ITypeDesignationDao; + +/** + * @author a.mueller + * + */ +@Repository +public class TypeDesignationHibernateImpl + extends ReferencedEntityDaoImpl implements ITypeDesignationDao { + private static final Logger logger = Logger.getLogger(TypeDesignationHibernateImpl.class); + + public TypeDesignationHibernateImpl() { + super(TypeDesignationBase.class); + } + + //TODO limit start + public List getAllTypeDesignations(Integer limit, Integer start) { + Criteria crit = getSession().createCriteria(TypeDesignationBase.class); + List results = crit.list(); + return results; + } + +} \ 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 index 0000000000..1ad1b8b749 --- /dev/null +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/INomenclaturalStatusDao.java @@ -0,0 +1,26 @@ +/** +* Copyright (C) 2007 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ +package eu.etaxonomy.cdm.persistence.dao.name; + +import java.util.List; + +import eu.etaxonomy.cdm.model.common.ReferencedEntityBase; +import eu.etaxonomy.cdm.model.name.NomenclaturalStatus; +import eu.etaxonomy.cdm.persistence.dao.common.IReferencedEntityDao; + +/** + * @author a.mueller + * + */ +public interface INomenclaturalStatusDao extends IReferencedEntityDao { + + public List getAllNomenclaturalStatus(Integer limit, Integer start); + + +} 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 832335af73..a1568051a5 100644 --- 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 @@ */ package eu.etaxonomy.cdm.persistence.dao.name; -import java.util.List; - -import org.hibernate.Criteria; - -import eu.etaxonomy.cdm.model.common.ReferencedEntityBase; -import eu.etaxonomy.cdm.model.name.NomenclaturalStatus; import eu.etaxonomy.cdm.model.name.TaxonNameBase; -import eu.etaxonomy.cdm.model.name.TypeDesignationBase; import eu.etaxonomy.cdm.persistence.dao.common.IIdentifiableDao; /** @@ -24,8 +17,5 @@ import eu.etaxonomy.cdm.persistence.dao.common.IIdentifiableDao; */ public interface ITaxonNameDao extends IIdentifiableDao { - public List getAllNomenclaturalStatus(Integer limit, Integer start); - - public List getAllTypeDesignations(Integer limit, Integer start); } 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 index 0000000000..041e7f3a07 --- /dev/null +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITypeDesignationDao.java @@ -0,0 +1,24 @@ +/** +* Copyright (C) 2007 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ +package eu.etaxonomy.cdm.persistence.dao.name; + +import java.util.List; + +import eu.etaxonomy.cdm.model.name.TypeDesignationBase; +import eu.etaxonomy.cdm.persistence.dao.common.IReferencedEntityDao; + +/** + * @author a.mueller + * + */ +public interface ITypeDesignationDao extends IReferencedEntityDao { + + public List getAllTypeDesignations(Integer limit, Integer start); + +}