[Castore-commits] JDOUserEventFactory.java 1.3.2.1 1.3.2.2 JDOUserMaintenance.java 1.2.2.1 1.2.2.2

[Stéphane Bouchet]

Update of /cvsroot/castore/castore-core/src/java/fr/emn/castor/users/jdo
In directory adullact1:/tmp/cvs-serv25212/src/java/fr/emn/castor/users/jdo

Modified Files:
      Tag: v1_1_branch
	JDOUserEventFactory.java JDOUserMaintenance.java 
Log Message:
correction bug gestion du profil

Index: JDOUserEventFactory.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/users/jdo/JDOUserEventFactory.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** JDOUserEventFactory.java	24 Nov 2005 14:30:28 -0000	1.3.2.1
--- JDOUserEventFactory.java	6 Mar 2006 12:31:35 -0000	1.3.2.2
***************
*** 45,51 ****
--- 45,53 ----
  import java.util.HashMap;
  import java.util.Iterator;
+ import java.util.List;
  import java.util.Map;
  
  import javax.jdo.PersistenceManager;
+ import javax.jdo.Query;
  import javax.jdo.Transaction;
  
[...1563 lines suppressed...]
       * @return
--- 1294,1298 ----
  
      /**
!      *
       * @param validator
       * @return
***************
*** 1441,1445 ****
      private boolean isAType(final String validator) {
          return ((validator.equals(Constants.SESSION_DOCUMENTALIST_KEY)) || (validator
!                 .equals(Constants.SESSION_SUPERVISOR_KEY)));
      }
  
--- 1300,1304 ----
      private boolean isAType(final String validator) {
          return ((validator.equals(Constants.SESSION_DOCUMENTALIST_KEY)) || (validator
!             .equals(Constants.SESSION_SUPERVISOR_KEY)));
      }
  

Index: JDOUserMaintenance.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/users/jdo/JDOUserMaintenance.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** JDOUserMaintenance.java	24 Nov 2005 14:30:28 -0000	1.2.2.1
--- JDOUserMaintenance.java	6 Mar 2006 12:31:35 -0000	1.2.2.2
***************
*** 683,690 ****
              try {
                  tx.begin();
!                 //TODO verifier le attachCopy
!                 UserProfil copieProfil = (UserProfil) pm.attachCopy(
!                     userProfil, true);
!                 copieProfil.removeDocRefuse(docId);
                  // pm.attachCopy(userProfil, true);
                  tx.commit();
--- 683,687 ----
              try {
                  tx.begin();
!                 userProfil.removeDocRefuse(docId);
                  // pm.attachCopy(userProfil, true);
                  tx.commit();
***************
*** 921,930 ****
              tx.begin();
              //MAJ des preferences
!             //TODO verifier le attachCopy
!             UserProfil copieProfil = (UserProfil) pm.attachCopy(
!                 userProfil, true);
!             copieProfil.setNbDernieresRequetesSauvees(nbRequetes);
!             copieProfil.setNbDerniersDocsLusAffiches(nbDocs);
!             copieProfil.setNbDerniersCollConsAffiches(nbColls);
              // pm.attachCopy(userProfil, true);
              tx.commit();
--- 918,924 ----
              tx.begin();
              //MAJ des preferences
!             userProfil.setNbDernieresRequetesSauvees(nbRequetes);
!             userProfil.setNbDerniersDocsLusAffiches(nbDocs);
!             userProfil.setNbDerniersCollConsAffiches(nbColls);
              // pm.attachCopy(userProfil, true);
              tx.commit();