method name harmonization

[cdmlib.git] / cdmlib-persistence / src / main / java / eu / etaxonomy / cdm / persistence / dao / hibernate / name / TaxonNameDaoHibernateImpl.java

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 08ff2d5e7910b2fede026c73651da211da2a2387..255a2b570aec3b1e3e0bffd1849773e064833d42 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
@@ -297,6 +297,9 @@ extends IdentifiableDaoBase<TaxonNameBase> implements ITaxonNameDao {
                }\r
        }\r
 \r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.cdm.persistence.dao.name.ITaxonNameDao#getNameRelationships(eu.etaxonomy.cdm.model.name.TaxonNameBase, eu.etaxonomy.cdm.model.common.RelationshipBase.Direction, eu.etaxonomy.cdm.model.name.NameRelationshipType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)\r
+        */\r
        public List<NameRelationship> getNameRelationships(TaxonNameBase name, NameRelationship.Direction direction, \r
                        NameRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, \r
                        List<String> propertyPaths) {\r
@@ -304,7 +307,9 @@ extends IdentifiableDaoBase<TaxonNameBase> implements ITaxonNameDao {
                AuditEvent auditEvent = getAuditEventFromContext();\r
                if(auditEvent.equals(AuditEvent.CURRENT_VIEW)) {\r
                        Criteria criteria = getSession().createCriteria(NameRelationship.class);\r
-                       criteria.add(Restrictions.eq(direction.toString(), name));\r
+                       if (name != null || direction != null){\r
+                               criteria.add(Restrictions.eq(direction.toString(), name));\r
+                       }\r
                        if(type != null) {\r
                                criteria.add(Restrictions.eq("type", type));\r
                        }\r
@@ -539,7 +544,7 @@ extends IdentifiableDaoBase<TaxonNameBase> implements ITaxonNameDao {
                return results;\r
        }\r
        \r
-       public List<RelationshipBase> getAllRelationships(Integer limit, Integer start) {\r
+       public List<RelationshipBase> getRelationships(Integer limit, Integer start) {\r
                AuditEvent auditEvent = getAuditEventFromContext();\r
                if(auditEvent.equals(AuditEvent.CURRENT_VIEW)) {\r
                    //FIXME only NameRelationships\r
@@ -604,7 +609,7 @@ extends IdentifiableDaoBase<TaxonNameBase> implements ITaxonNameDao {
                return persistentObject.getUuid();\r
        }\r
        \r
-       public List<ZoologicalName> getAllZoologicalNames(Integer limit, Integer start){\r
+       public List<ZoologicalName> getZoologicalNames(Integer limit, Integer start){\r
                List <TaxonNameBase> names = new ArrayList<TaxonNameBase>();\r
                List <ZoologicalName> zooNames = new ArrayList<ZoologicalName>();\r
                names = super.list(ZoologicalName.class, limit, start);\r