Index: topia/src/java/org/codelutin/topia/TopiaEntity.java diff -u topia/src/java/org/codelutin/topia/TopiaEntity.java:1.14 topia/src/java/org/codelutin/topia/TopiaEntity.java:1.15 --- topia/src/java/org/codelutin/topia/TopiaEntity.java:1.14 Wed Sep 15 14:36:04 2004 +++ topia/src/java/org/codelutin/topia/TopiaEntity.java Fri Dec 17 16:13:51 2004 @@ -23,9 +23,9 @@ * * @author Cédric Pineau * Copyright Code Lutin -* @version $Revision: 1.14 $ +* @version $Revision: 1.15 $ * -* Last update : $Date: 2004/09/15 14:36:04 $ +* Last update : $Date: 2004/12/17 16:13:51 $ * by : $Author: pineau $ */ package org.codelutin.topia; @@ -41,15 +41,15 @@ public Class getEntityClass(); public String get_topiaId_() throws TopiaException; - public String get_version_() throws TopiaException; - public Date get_creationDate_() throws TopiaException; - public Date get_lastUpdateDate_() throws TopiaException; - public TopiaUser get_lastUpdateUser_() throws TopiaException; + public String get_topiaVersion_() throws TopiaException; + public Date get_topiaCreationDate_() throws TopiaException; + public Date get_topiaLastUpdateDate_() throws TopiaException; + public TopiaUser get_topiaLastUpdateUser_() throws TopiaException; public void set_topiaId_(String v) throws TopiaException; - public void set_version_(String v) throws TopiaException; - public void set_creationDate_(Date v) throws TopiaException; - public void set_lastUpdateDate_(Date v) throws TopiaException; - public void set_lastUpdateUser_(TopiaUser v) throws TopiaException; + public void set_topiaVersion_(String v) throws TopiaException; + public void set_topiaCreationDate_(Date v) throws TopiaException; + public void set_topiaLastUpdateDate_(Date v) throws TopiaException; + public void set_topiaLastUpdateUser_(TopiaUser v) throws TopiaException; } // TopiaEntity Index: topia/src/java/org/codelutin/topia/TopiaPersistenceService.java diff -u topia/src/java/org/codelutin/topia/TopiaPersistenceService.java:1.7 topia/src/java/org/codelutin/topia/TopiaPersistenceService.java:1.8 --- topia/src/java/org/codelutin/topia/TopiaPersistenceService.java:1.7 Thu Sep 2 15:45:37 2004 +++ topia/src/java/org/codelutin/topia/TopiaPersistenceService.java Fri Dec 17 16:13:51 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.7 $ + * @version $Revision: 1.8 $ * - * Mise a jour: $Date: 2004/09/02 15:45:37 $ - * par : $Author: mazelier $ + * Mise a jour: $Date: 2004/12/17 16:13:51 $ + * par : $Author: pineau $ */ package org.codelutin.topia; @@ -130,5 +130,5 @@ /** * Return attributes name */ - public String [] getFieldNames(); + public String [] getFieldNames() throws TopiaException; } Index: topia/src/java/org/codelutin/topia/AbstractTopiaEntity.java diff -u topia/src/java/org/codelutin/topia/AbstractTopiaEntity.java:1.2 topia/src/java/org/codelutin/topia/AbstractTopiaEntity.java:1.3 --- topia/src/java/org/codelutin/topia/AbstractTopiaEntity.java:1.2 Thu Jul 15 13:13:12 2004 +++ topia/src/java/org/codelutin/topia/AbstractTopiaEntity.java Fri Dec 17 16:13:51 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2004/07/15 13:13:12 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2004/12/17 16:13:51 $ + * par : $Author: pineau $ */ package org.codelutin.topia; @@ -37,17 +37,17 @@ public abstract class AbstractTopiaEntity extends AbstractTopiaElement implements TopiaEntity { // AbstractTopiaEntity protected String _topiaId_ = null; - protected String _version_; - protected Date _creationDate_; - protected Date _lastUpdateDate_; - protected TopiaUser _lastUpdateUser_; + protected String _topiaVersion_; + protected Date _topiaCreationDate_; + protected Date _topiaLastUpdateDate_; + protected TopiaUser _topiaLastUpdateUser_; public AbstractTopiaEntity() throws TopiaException { set_topiaId_(TopiaId.create(getEntityClass())); Date date = new Date(); - set_creationDate_(date); - set_lastUpdateDate_(date); - set_version_("0"); + set_topiaCreationDate_(date); + set_topiaLastUpdateDate_(date); + set_topiaVersion_("0"); } /** @@ -57,8 +57,8 @@ if(o instanceof TopiaEntity){ try{ String topiaId = ((TopiaEntity)o).get_topiaId_(); - String version = ((TopiaEntity)o).get_version_(); - return _topiaId_.equals(topiaId) && VersionNumberUtil.equals(_version_,version); + String version = ((TopiaEntity)o).get_topiaVersion_(); + return _topiaId_.equals(topiaId) && VersionNumberUtil.equals(_topiaVersion_,version); }catch(TopiaException eee){ throw new RuntimeException("Can't check equality", eee); } @@ -67,7 +67,7 @@ } public String toString(){ - return "Entity " + _topiaId_ + "(version " + _version_ + ")"; + return "Entity " + _topiaId_ + "(version " + _topiaVersion_ + ")"; } public String get_topiaId_() throws TopiaException { @@ -88,32 +88,32 @@ // } this._topiaId_ = topiaId; } - public String get_version_() throws TopiaException { - return _version_; + public String get_topiaVersion_() throws TopiaException { + return _topiaVersion_; } - public void set_version_(String version) throws TopiaException { - this._version_ = version; + public void set_topiaVersion_(String version) throws TopiaException { + this._topiaVersion_ = version; } - public Date get_creationDate_() throws TopiaException{ - return _creationDate_; + public Date get_topiaCreationDate_() throws TopiaException{ + return _topiaCreationDate_; } - public void set_creationDate_(Date creationDate) throws TopiaException { - this._creationDate_ = creationDate; + public void set_topiaCreationDate_(Date creationDate) throws TopiaException { + this._topiaCreationDate_ = creationDate; } - public Date get_lastUpdateDate_() throws TopiaException { - return _lastUpdateDate_; + public Date get_topiaLastUpdateDate_() throws TopiaException { + return _topiaLastUpdateDate_; } - public void set_lastUpdateDate_(Date lastUpdateDate) throws TopiaException { - this._lastUpdateDate_ = lastUpdateDate; + public void set_topiaLastUpdateDate_(Date lastUpdateDate) throws TopiaException { + this._topiaLastUpdateDate_ = lastUpdateDate; } - public TopiaUser get_lastUpdateUser_() throws TopiaException { - return _lastUpdateUser_; + public TopiaUser get_topiaLastUpdateUser_() throws TopiaException { + return _topiaLastUpdateUser_; } - public void set_lastUpdateUser_(TopiaUser lastUpdateUser) throws TopiaException { - this._lastUpdateUser_ = lastUpdateUser; + public void set_topiaLastUpdateUser_(TopiaUser lastUpdateUser) throws TopiaException { + this._topiaLastUpdateUser_ = lastUpdateUser; } } // AbstractTopiaEntity