[Castore-commits] UserProfil.java 1.10 1.11

[mathieu grimault]

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

Modified Files:
	UserProfil.java 
Log Message:
Annulation dans castore.
Le thread de retro est mise en attente jusqu'a la fin de soumission.

Index: UserProfil.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/users/metier/UserProfil.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** UserProfil.java	6 Nov 2006 10:10:00 -0000	1.10
--- UserProfil.java	14 Dec 2006 10:25:34 -0000	1.11
***************
*** 355,365 ****
       */
      public void removeDocFromAllCollection(final String idDoc) {
!         if (this.docsRefuses.contains(idDoc))
              this.docsRefuses.remove(idDoc);
!         if (this.docsPrives.contains(idDoc))
              this.docsPrives.remove(idDoc);
!         if (this.docsAcceptes.contains(idDoc))
              this.docsAcceptes.remove(idDoc);
!         this.docsEnAttente.remove(idDoc);
      }
  
--- 355,370 ----
       */
      public void removeDocFromAllCollection(final String idDoc) {
!         if (this.docsRefuses.contains(idDoc)) {
              this.docsRefuses.remove(idDoc);
!         }
!         if (this.docsPrives.contains(idDoc)) {
              this.docsPrives.remove(idDoc);
!         }
!         if (this.docsAcceptes.contains(idDoc)) {
              this.docsAcceptes.remove(idDoc);
!         }
!         if (this.docsAcceptes.contains(idDoc)) {
!         	this.docsEnAttente.remove(idDoc);
!         }
      }
  
***************
*** 388,392 ****
       */
      public void removeDocLus(final String idDoc) {
!         this.derniersDocsLus.remove(idDoc);
      }
  
--- 393,399 ----
       */
      public void removeDocLus(final String idDoc) {
!     	if (this.derniersDocsLus.contains(idDoc)) {
!     		this.derniersDocsLus.remove(idDoc);
!     	}
      }