Index: topia2/src/java/org/codelutin/topia/persistence/hibernate/TopiaDAOHibernate.java diff -u topia2/src/java/org/codelutin/topia/persistence/hibernate/TopiaDAOHibernate.java:1.10 topia2/src/java/org/codelutin/topia/persistence/hibernate/TopiaDAOHibernate.java:1.11 --- topia2/src/java/org/codelutin/topia/persistence/hibernate/TopiaDAOHibernate.java:1.10 Mon Sep 4 09:55:22 2006 +++ topia2/src/java/org/codelutin/topia/persistence/hibernate/TopiaDAOHibernate.java Thu Sep 28 15:46:09 2006 @@ -23,9 +23,9 @@ * * @author poussin * - * @version $Revision: 1.10 $ + * @version $Revision: 1.11 $ * - * Last update: $Date: 2006/09/04 09:55:22 $ by : $Author: ruchaud $ + * Last update: $Date: 2006/09/28 15:46:09 $ by : $Author: ruchaud $ */ package org.codelutin.topia.persistence.hibernate; @@ -153,7 +153,7 @@ /* (non-Javadoc) * @see org.codelutin.topia.persistence.TopiaDAO#queryAll(org.hibernate.criterion.Criterion) */ - public List queryAll(Criterion criterion) throws TopiaException { + private List queryAll(Criterion criterion) throws TopiaException { try { Criteria criteria = createCriteria(FlushMode.AUTO); criteria.add(criterion); @@ -167,7 +167,7 @@ /* (non-Javadoc) * @see org.codelutin.topia.persistence.TopiaDAO#query(org.hibernate.criterion.Criterion) */ - public Entity query(Criterion criterion) throws TopiaException { + private Entity query(Criterion criterion) throws TopiaException { try { Criteria criteria = createCriteria(FlushMode.AUTO); criteria.add(criterion); @@ -182,60 +182,6 @@ } } - public List queryAll(Projection projection, Criterion criterion) throws TopiaException { - try { - Criteria criteria = createCriteria(FlushMode.AUTO); - criteria.setProjection(projection); - criteria.add(criterion); - List result = criteria.list(); - return result; - } catch (HibernateException eee) { - throw new TopiaException(eee); - } - } - - public Object query(Projection projection, Criterion criterion) throws TopiaException { - try { - Criteria criteria = createCriteria(FlushMode.AUTO); - criteria.setProjection(projection); - criteria.add(criterion); - criteria.setMaxResults(1); - List result = criteria.list(); - if (result != null && result.size() > 0) { - return result.get(0); - } - return null; - } catch (HibernateException eee) { - throw new TopiaException(eee); - } - } - - public Object project(Projection projection) throws TopiaException { - try { - Criteria criteria = createCriteria(FlushMode.AUTO); - criteria.setProjection(projection); - criteria.setMaxResults(1); - List result = criteria.list(); - if (result != null && result.size() > 0) { - return result.get(0); - } - return null; - } catch (HibernateException eee) { - throw new TopiaException(eee); - } - } - - public List projectAll(Projection projection) throws TopiaException { - try { - Criteria criteria = createCriteria(FlushMode.AUTO); - criteria.setProjection(projection); - List result = criteria.list(); - return result; - } catch (HibernateException eee) { - throw new TopiaException(eee); - } - } - //FIXME : Commenté car impossible de trouver le bon Criterion // /* (non-Javadoc) @@ -284,7 +230,7 @@ * @param mode le FlushMode du Criteria * @return le Criteria nouvellement créé */ - public Criteria createCriteria(FlushMode mode) throws TopiaException { + private Criteria createCriteria(FlushMode mode) throws TopiaException { Criteria criteria = getSession().createCriteria(entityClass); criteria.setFlushMode(mode); return criteria;