Index: topia/src/java/org/codelutin/topia/persistence/serialization/SerializablePersistenceHelper.java diff -u topia/src/java/org/codelutin/topia/persistence/serialization/SerializablePersistenceHelper.java:1.6 topia/src/java/org/codelutin/topia/persistence/serialization/SerializablePersistenceHelper.java:1.7 --- topia/src/java/org/codelutin/topia/persistence/serialization/SerializablePersistenceHelper.java:1.6 Thu Jun 23 14:03:37 2005 +++ topia/src/java/org/codelutin/topia/persistence/serialization/SerializablePersistenceHelper.java Tue Jun 28 18:11:09 2005 @@ -24,7 +24,7 @@ * Created: 10 juin 2005 * * @author Arnaud Thimel -* @version $Revision: 1.6 $ +* @version $Revision: 1.7 $ */ @@ -52,7 +52,7 @@ import org.codelutin.topia.TopiaException; import org.codelutin.topia.TopiaQuery; import org.codelutin.topia.persistence.AbstractPersistenceHelper; -import org.codelutin.topia.persistence.TopiaCollectionQueryHelper; +import org.codelutin.querycollection.CollectionQueryHelper; import org.codelutin.topia.persistence.jdo.Util; import org.codelutin.util.VersionNumberUtil; @@ -64,11 +64,11 @@ "persistence.serialization.SerializablePersistenceHelper"); HashMap entities; - + public void finalize() { //Au cas oł ca fonctionne... destroy(); } - + public void destroy() { File dbFile = getPersistenceFile(); log.fine("Using file : " + dbFile.getAbsolutePath()); @@ -100,7 +100,7 @@ fileName = "db.file"; return new File(fileName); } - + private void load() { File dbFile = getPersistenceFile(); if (dbFile.exists()) { @@ -126,7 +126,7 @@ TopiaEntity entity = (TopiaEntity) Util.getInstance(clazz); return entity; } - + /* (non-Javadoc) * @see org.codelutin.topia.persistence.PersistenceHelper#makePersistent(org.codelutin.topia.TopiaEntity) */ @@ -154,7 +154,7 @@ return entity; } - + /* (non-Javadoc) * @see org.codelutin.topia.persistence.PersistenceHelper#update(org.codelutin.topia.TopiaEntity) */ @@ -177,7 +177,7 @@ * @see org.codelutin.topia.persistence.PersistenceHelper#find(org.codelutin.topia.TopiaQuery) */ public List find(TopiaQuery query) throws TopiaException { - TopiaCollectionQueryHelper queryHelper = new TopiaCollectionQueryHelper(entities.values()); + CollectionQueryHelper queryHelper = new CollectionQueryHelper(entities.values()); List result = null; try { queryHelper.setQuery(query.getQueryString());