Index: topia/src/java/org/codelutin/topia/jdo/TopiaJDOPersistenceHelper.java
diff -u topia/src/java/org/codelutin/topia/jdo/TopiaJDOPersistenceHelper.java:1.3 topia/src/java/org/codelutin/topia/jdo/TopiaJDOPersistenceHelper.java:1.4
--- topia/src/java/org/codelutin/topia/jdo/TopiaJDOPersistenceHelper.java:1.3	Wed Jun  2 09:33:08 2004
+++ topia/src/java/org/codelutin/topia/jdo/TopiaJDOPersistenceHelper.java	Wed Jun 30 13:40:36 2004
@@ -12,21 +12,20 @@
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
 
+import org.codelutin.queryjdo.JDOQueryHelper;
+import org.codelutin.queryparser.QueryHelper;
 import org.codelutin.topia.TopiaPersistenceHelper;
-import org.codelutin.queryparser.Query;
-import org.codelutin.queryparser.QueryExecute;
-import org.codelutin.queryjdo.JDOQueryExecute;
 
 public class TopiaJDOPersistenceHelper extends TopiaPersistenceHelper {
 
     protected PersistenceManager persistenceManager = null;
-    protected QueryExecute queryExecute = null;
+    protected QueryHelper queryHelper = null;
 
-    public QueryExecute getQueryExecute(){
-        if(queryExecute == null){
-            queryExecute = new JDOQueryExecute(getPersistenceManager());
+    public QueryHelper getQueryHelper(){
+        if(queryHelper == null){
+            queryHelper = new JDOQueryHelper(getPersistenceManager());
         }
-        return queryExecute;
+        return queryHelper;
     }
 
     public PersistenceManager getPersistenceManager() {

Index: topia/src/java/org/codelutin/topia/jdo/AbstractTopiaJDOPersistenceService.java
diff -u topia/src/java/org/codelutin/topia/jdo/AbstractTopiaJDOPersistenceService.java:1.9 topia/src/java/org/codelutin/topia/jdo/AbstractTopiaJDOPersistenceService.java:1.10
--- topia/src/java/org/codelutin/topia/jdo/AbstractTopiaJDOPersistenceService.java:1.9	Fri Jun 18 18:58:24 2004
+++ topia/src/java/org/codelutin/topia/jdo/AbstractTopiaJDOPersistenceService.java	Wed Jun 30 13:40:36 2004
@@ -23,14 +23,14 @@
 *
 * @author Cédric Pineau <pineau@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.9 $
+* @version $Revision: 1.10 $
 *
-* Last update : $Date: 2004/06/18 18:58:24 $
-* by : $Author: bpoussin $
+* Last update : $Date: 2004/06/30 13:40:36 $
+* by : $Author: pineau $
 */
 package org.codelutin.topia.jdo;
 
-import java.util.List;
+import java.util.HashSet;
 
 import javax.jdo.PersistenceManager;
 import javax.jdo.Transaction;
@@ -38,14 +38,9 @@
 import org.codelutin.topia.AbstractTopiaPersistenceService;
 import org.codelutin.topia.TopiaEntity;
 import org.codelutin.topia.TopiaEntityDO;
-import org.codelutin.topia.TopiaEntityListener;
 import org.codelutin.topia.TopiaEntityTO;
 import org.codelutin.topia.TopiaException;
-import org.codelutin.topia.TopiaPersistenceService;
-import org.codelutin.topia.TopiaQuery;
 import org.codelutin.topia.Util;
-import org.codelutin.util.ListenerSet;
-import java.util.HashSet;
 
 /**
 * This abstract class propose a partial default TopiaPersistenceService implementation.
@@ -110,7 +105,7 @@
         if (topiaEntity.get_topiaId_() != null) {
             throw new TopiaException("Can't persist "+topiaEntity+" has it seems to exist, please use update instead !");
         }
-        TopiaEntityTO _to = (TopiaEntityTO) Util.toTO(topiaEntity);
+        TopiaEntityTO _to = Util.toTO(topiaEntity);
         PersistenceManager persistenceManager = ((TopiaJDOPersistenceHelper) getContext().getPersistenceHelper()).getPersistenceManager();
         Transaction transaction = persistenceManager.currentTransaction();
         transaction.begin();
@@ -133,7 +128,7 @@
         if (topiaEntity.get_topiaId_() == null) {
             throw new TopiaException("Can't update "+topiaEntity+" has it seems not to exist, please use makePersistent instead !");
         }
-        TopiaEntityTO _to = (TopiaEntityTO) Util.toTO(topiaEntity);
+        TopiaEntityTO _to = Util.toTO(topiaEntity);
         PersistenceManager persistenceManager = ((TopiaJDOPersistenceHelper) getContext().getPersistenceHelper()).getPersistenceManager();
         Transaction transaction = persistenceManager.currentTransaction();
         transaction.begin();