Index: topia/src/java/org/codelutin/topia/PrivateTopiaEntityTO.java diff -u topia/src/java/org/codelutin/topia/PrivateTopiaEntityTO.java:1.1 topia/src/java/org/codelutin/topia/PrivateTopiaEntityTO.java:1.2 --- topia/src/java/org/codelutin/topia/PrivateTopiaEntityTO.java:1.1 Fri Jun 18 18:29:19 2004 +++ topia/src/java/org/codelutin/topia/PrivateTopiaEntityTO.java Wed Jun 30 13:40:36 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/06/18 18:29:19 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2004/06/30 13:40:36 $ + * par : $Author: pineau $ */ package org.codelutin.topia; @@ -40,7 +40,7 @@ * @param entity une entity respectant l'interface de l'objet ou un enfant * de cette interface. */ - public void set_allProperties_(TopiaEntity enity) throws TopiaException; + public void set_allProperties_(TopiaEntity entity) throws TopiaException; public TopiaEntityDO toDO(HashSet done) throws TopiaException; Index: topia/src/java/org/codelutin/topia/DefaultTopiaEntityListener.java diff -u topia/src/java/org/codelutin/topia/DefaultTopiaEntityListener.java:1.1 topia/src/java/org/codelutin/topia/DefaultTopiaEntityListener.java:1.2 --- topia/src/java/org/codelutin/topia/DefaultTopiaEntityListener.java:1.1 Fri May 14 15:34:51 2004 +++ topia/src/java/org/codelutin/topia/DefaultTopiaEntityListener.java Wed Jun 30 13:40:36 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/05/14 15:34:51 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2004/06/30 13:40:36 $ + * par : $Author: pineau $ */ package org.codelutin.topia; @@ -37,8 +37,8 @@ * souhaite créer un listener. */ public class DefaultTopiaEntityListener implements TopiaEntityListener { // DefaultTopiaEntityListener - public void add(TopiaEntityEvent event){} - public void modify(TopiaEntityEvent event){} - public void remove(TopiaEntityEvent event){} + public void entityAdded(TopiaEntityEvent event){} + public void entityModified(TopiaEntityEvent event){} + public void entityRemoved(TopiaEntityEvent event){} } // DefaultTopiaEntityListener Index: topia/src/java/org/codelutin/topia/PrivateTopiaEntityDO.java diff -u topia/src/java/org/codelutin/topia/PrivateTopiaEntityDO.java:1.1 topia/src/java/org/codelutin/topia/PrivateTopiaEntityDO.java:1.2 --- topia/src/java/org/codelutin/topia/PrivateTopiaEntityDO.java:1.1 Fri Jun 18 18:29:19 2004 +++ topia/src/java/org/codelutin/topia/PrivateTopiaEntityDO.java Wed Jun 30 13:40:36 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/06/18 18:29:19 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2004/06/30 13:40:36 $ + * par : $Author: pineau $ */ package org.codelutin.topia; @@ -40,7 +40,7 @@ * @param entity une entity respectant l'interface de l'objet ou un enfant * de cette interface. */ - public void set_allProperties_(TopiaEntityTO enity, HashSet done) throws TopiaException; + public void set_allProperties_(TopiaEntityTO entity, HashSet done) throws TopiaException; } // PrivateTopiaEntityDO Index: topia/src/java/org/codelutin/topia/TopiaEntityListener.java diff -u topia/src/java/org/codelutin/topia/TopiaEntityListener.java:1.2 topia/src/java/org/codelutin/topia/TopiaEntityListener.java:1.3 --- topia/src/java/org/codelutin/topia/TopiaEntityListener.java:1.2 Fri May 14 15:34:51 2004 +++ topia/src/java/org/codelutin/topia/TopiaEntityListener.java Wed Jun 30 13:40:36 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2004/05/14 15:34:51 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2004/06/30 13:40:36 $ + * par : $Author: pineau $ */ package org.codelutin.topia; @@ -38,14 +38,14 @@ /** * Appelé lorsqu'une ou plusieurs entités ont été créées */ - public void add(TopiaEntityEvent event); + public void entityAdded(TopiaEntityEvent event); /** * Appelé lorsqu'une ou plusieurs entités ont été modifiées */ - public void modify(TopiaEntityEvent event); + public void entityModified(TopiaEntityEvent event); /** * Appelé lorsqu'une ou plusieurs entités ont été supprimées */ - public void remove(TopiaEntityEvent event); + public void entityRemoved(TopiaEntityEvent event); } Index: topia/src/java/org/codelutin/topia/TopiaEntityEvent.java diff -u topia/src/java/org/codelutin/topia/TopiaEntityEvent.java:1.1 topia/src/java/org/codelutin/topia/TopiaEntityEvent.java:1.2 --- topia/src/java/org/codelutin/topia/TopiaEntityEvent.java:1.1 Fri May 14 15:34:51 2004 +++ topia/src/java/org/codelutin/topia/TopiaEntityEvent.java Wed Jun 30 13:40:36 2004 @@ -23,22 +23,23 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/05/14 15:34:51 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2004/06/30 13:40:36 $ + * par : $Author: pineau $ */ package org.codelutin.topia; -import java.util.EventObject; +import java.util.ArrayList; import java.util.Collections; +import java.util.Date; +import java.util.EventObject; import java.util.List; -import java.util.ArrayList; public class TopiaEntityEvent extends EventObject { // TopiaEntityEvent - protected long time = 0; + protected long date = 0; protected List entities = null; /** @@ -47,7 +48,7 @@ */ public TopiaEntityEvent(Object source, TopiaEntity entity){ super(source); - time = System.currentTimeMillis(); + date = System.currentTimeMillis(); List entities = new ArrayList(); entities.add(entity); this.entities = Collections.unmodifiableList(entities); @@ -59,7 +60,7 @@ */ public TopiaEntityEvent(Object source, List entities){ super(source); - time = System.currentTimeMillis(); + date = System.currentTimeMillis(); this.entities = Collections.unmodifiableList(entities); } @@ -74,8 +75,8 @@ /** * Le moment ou l'event a ete créé. */ - public long getTime(){ - return time; + public Date getCreationDate(){ + return new Date(date); } } // TopiaEntityEvent Index: topia/src/java/org/codelutin/topia/PrivateTopiaPersistenceService.java diff -u topia/src/java/org/codelutin/topia/PrivateTopiaPersistenceService.java:1.3 topia/src/java/org/codelutin/topia/PrivateTopiaPersistenceService.java:1.4 --- topia/src/java/org/codelutin/topia/PrivateTopiaPersistenceService.java:1.3 Fri Jun 18 18:29:19 2004 +++ topia/src/java/org/codelutin/topia/PrivateTopiaPersistenceService.java Wed Jun 30 13:40:36 2004 @@ -23,17 +23,16 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ * - * Mise a jour: $Date: 2004/06/18 18:29:19 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2004/06/30 13:40:36 $ + * par : $Author: pineau $ */ package org.codelutin.topia; -import java.util.HashMap; -import java.util.List; import java.util.HashSet; +import java.util.List; /** * Regroupement de tout les méthodes du framework pour les services de Index: topia/src/java/org/codelutin/topia/PrivateTopiaEntity.java diff -u topia/src/java/org/codelutin/topia/PrivateTopiaEntity.java:1.2 topia/src/java/org/codelutin/topia/PrivateTopiaEntity.java:1.3 --- topia/src/java/org/codelutin/topia/PrivateTopiaEntity.java:1.2 Fri Jun 18 18:29:19 2004 +++ topia/src/java/org/codelutin/topia/PrivateTopiaEntity.java Wed Jun 30 13:40:36 2004 @@ -23,15 +23,14 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2004/06/18 18:29:19 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2004/06/30 13:40:36 $ + * par : $Author: pineau $ */ package org.codelutin.topia; -import java.util.HashSet; /** * Methode utilisée par le framework, elles se retrouvent sur les TO et les DO Index: topia/src/java/org/codelutin/topia/TopiaPersistenceHelper.java diff -u topia/src/java/org/codelutin/topia/TopiaPersistenceHelper.java:1.3 topia/src/java/org/codelutin/topia/TopiaPersistenceHelper.java:1.4 --- topia/src/java/org/codelutin/topia/TopiaPersistenceHelper.java:1.3 Fri Jun 4 18:43:54 2004 +++ topia/src/java/org/codelutin/topia/TopiaPersistenceHelper.java Wed Jun 30 13:40:36 2004 @@ -6,8 +6,8 @@ */ package org.codelutin.topia; -import org.codelutin.queryparser.QueryExecute; -import org.codelutin.queryparser.QueryExecuteException; +import org.codelutin.queryparser.QueryHelper; +import org.codelutin.queryparser.QueryHelperException; import java.util.Collection; import java.io.IOException; @@ -34,25 +34,25 @@ } /** - * Execute one query. Query must be complete with select, from, where, ... + * Helper one query. Query must be complete with select, from, where, ... */ public Collection execute(TopiaQuery query) throws TopiaException{ try{ - QueryExecute queryExecute = getQueryExecute(); - queryExecute.setQuery(query.getQueryString()); - queryExecute.setArgs(query.getArgs()); - return queryExecute.execute(); + QueryHelper queryHelper = getQueryHelper(); + queryHelper.setQuery(query.getQueryString()); + queryHelper.setArgs(query.getArgs()); + return queryHelper.Helper(); }catch(IOException eee){ throw new TopiaException("Error during query parsing", eee); - }catch(QueryExecuteException eee){ + }catch(QueryHelperException eee){ throw new TopiaException("Error during query execution", eee); } } /** - * Child class must implement this method and return the right QueryExecute + * Child class must implement this method and return the right QueryHelper * object for the persistence type. */ - abstract protected QueryExecute getQueryExecute(); + abstract protected QueryHelper getQueryHelper(); } Index: topia/src/java/org/codelutin/topia/AbstractTopiaPersistenceService.java diff -u topia/src/java/org/codelutin/topia/AbstractTopiaPersistenceService.java:1.2 topia/src/java/org/codelutin/topia/AbstractTopiaPersistenceService.java:1.3 --- topia/src/java/org/codelutin/topia/AbstractTopiaPersistenceService.java:1.2 Wed Jun 16 09:41:26 2004 +++ topia/src/java/org/codelutin/topia/AbstractTopiaPersistenceService.java Wed Jun 30 13:40:36 2004 @@ -23,25 +23,21 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2004/06/16 09:41:26 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2004/06/30 13:40:36 $ + * par : $Author: pineau $ */ package org.codelutin.topia; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaEntityDO; -import org.codelutin.topia.TopiaQuery; -import org.codelutin.util.ListenerSet; -import org.codelutin.topia.TopiaEntityListener; -import java.util.List; -import java.util.Collection; import java.util.ArrayList; -import java.util.Iterator; -import java.util.HashMap; +import java.util.Collection; import java.util.Date; +import java.util.Iterator; +import java.util.List; + +import org.codelutin.util.ListenerSet; public abstract class AbstractTopiaPersistenceService extends AbstractTopiaService implements TopiaPersistenceService, PrivateTopiaPersistenceService { // AbstractTopiaPersistenceService @@ -73,7 +69,7 @@ */ public TopiaEntityTO create() throws TopiaException { TopiaEntityTO result = - (TopiaEntityTO)getContext().createEntity(getEntityClass()); + getContext().createEntity(getEntityClass()); Date date = new Date(); result.set_creationDate_(date); result.set_lastUpdateDate_(date); @@ -167,7 +163,7 @@ TopiaPersistenceHelper persistence = getContext().getPersistenceHelper(); - return (Collection) persistence.execute(newQuery); + return persistence.execute(newQuery); } /**