Author: glandais Date: 2008-03-21 16:49:29 +0000 (Fri, 21 Mar 2008) New Revision: 1437 Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java Log: Mergin save and update of actors Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java 2008-03-21 16:49:07 UTC (rev 1436) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java 2008-03-21 16:49:29 UTC (rev 1437) @@ -39,13 +39,22 @@ public Actor getActor(Integer id); /** - * Save user. + * Update actor. * - * @param user the user + * @param actor the actor + * + * @return the actor */ - public void saveUser(User user); + public Actor updateActor(Actor actor); /** + * Save actor. + * + * @param actor the actor + */ + public void saveActor(Actor actor); + + /** * Gets the user. * * @param id the id @@ -64,15 +73,6 @@ public User getUser(String login); /** - * Update user. - * - * @param user the user - * - * @return the user - */ - public User updateUser(User user); - - /** * Delete user. * * @param id the id @@ -80,13 +80,6 @@ public void deleteUser(Integer id); /** - * Save group. - * - * @param group the group - */ - public void saveGroup(Group group); - - /** * Gets the group. * * @param id the id @@ -105,15 +98,6 @@ public Group getGroup(String name); /** - * Update group. - * - * @param group the group - * - * @return the group - */ - public Group updateGroup(Group group); - - /** * Delete group. * * @param id the id @@ -168,6 +152,6 @@ */ public Collection<User> getUsers(); - //public Object debugQuery(String query, int type); + // public Object debugQuery(String query, int type); } Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-21 16:49:07 UTC (rev 1436) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-21 16:49:29 UTC (rev 1437) @@ -146,39 +146,17 @@ actor.setVisible(true); } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#saveGroup(fr.cemagref.simexplorer.is.security.entities.Group) - */ - public void saveGroup(Group group) { - setActorVisible(group); - em.persist(group); + public void saveActor(Actor actor) { + setActorVisible(actor); + em.persist(actor); } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#saveUser(fr.cemagref.simexplorer.is.security.entities.User) - */ - public void saveUser(User user) { - setActorVisible(user); - em.persist(user); + public Actor updateActor(Actor actor) { + setActorVisible(actor); + return em.merge(actor); } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#updateGroup(fr.cemagref.simexplorer.is.security.entities.Group) - */ - public Group updateGroup(Group group) { - setActorVisible(group); - return em.merge(group); - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#updateUser(fr.cemagref.simexplorer.is.security.entities.User) - */ - public User updateUser(User user) { - setActorVisible(user); - return em.merge(user); - } - - /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#getLoggedUser(java.lang.String) */ public User getLoggedUser(String token) { @@ -190,7 +168,6 @@ loginAction.setLoginDate((new Date()).getTime()); em.merge(loginAction); } - // TODO avoid NPE return loggedUser; }