Index: topia2/src/java/org/codelutin/topia/persistence/hibernate/TopiaDAOHibernate.java diff -u topia2/src/java/org/codelutin/topia/persistence/hibernate/TopiaDAOHibernate.java:1.17 topia2/src/java/org/codelutin/topia/persistence/hibernate/TopiaDAOHibernate.java:1.18 --- topia2/src/java/org/codelutin/topia/persistence/hibernate/TopiaDAOHibernate.java:1.17 Thu Dec 13 15:26:19 2007 +++ topia2/src/java/org/codelutin/topia/persistence/hibernate/TopiaDAOHibernate.java Thu Dec 20 14:29:29 2007 @@ -23,9 +23,9 @@ * * @author poussin * - * @version $Revision: 1.17 $ + * @version $Revision: 1.18 $ * - * Last update: $Date: 2007-12-13 15:26:19 $ by : $Author: thimel $ + * Last update: $Date: 2007-12-20 14:29:29 $ by : $Author: ruchaud $ */ package org.codelutin.topia.persistence.hibernate; @@ -113,7 +113,7 @@ try { Criteria criteria = createCriteria(FlushMode.AUTO); List result = (List)criteria.list(); - result = filterElements(result); + result = getContext().getFiresSupport().fireEntitiesLoad(context, result); return result; } catch (HibernateException eee) { throw new TopiaException(eee); @@ -157,7 +157,7 @@ Criteria criteria = createCriteria(FlushMode.AUTO); criteria.add(criterion); List result = (List)criteria.list(); - result = filterElements(result); + result = getContext().getFiresSupport().fireEntitiesLoad(context, result); return result; } catch (HibernateException eee) { throw new TopiaException(eee); @@ -173,7 +173,7 @@ criteria.add(criterion); criteria.setMaxResults(1); List result = (List)criteria.list(); - result = filterElements(result); + result = getContext().getFiresSupport().fireEntitiesLoad(context, result); if (result != null && result.size() > 0) { Entity elem = result.get(0); return elem; @@ -252,24 +252,5 @@ public List getRequestPermission(String topiaId, int actions) throws TopiaException { return null; } - - private List filterElements(List list) { - return list; - - //TODO (thimel 20071213) On commente pour le moment, on réactivera peut-être quand on aura la possibilité de tester plus longuement. -// if (list != null) { -// List result = new ArrayList(list.size()); -// for (Entity elem : list) { -// try { -// getContext().getFiresSupport().fireOnPreLoad(context, elem, null); -// result.add(elem); -// } catch (TopiaVetoException tve) { -// //Exception, on retire l'element -// } -// } -// return result; -// } -// return null; - } - + } //TopiaDAOHibernate