[Castore-commits] UserProfil.java 1.9 1.10

[Céline BENOIT]

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

Modified Files:
	UserProfil.java 
Log Message:
ajout de test avant remove

Index: UserProfil.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/users/metier/UserProfil.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** UserProfil.java	26 Oct 2006 16:28:18 -0000	1.9
--- UserProfil.java	6 Nov 2006 10:10:00 -0000	1.10
***************
*** 295,301 ****
       */
      public void addNouveauDocEnAttente(final String idDoc) {
!         this.docsPrives.remove(idDoc);
!         this.docsRefuses.remove(idDoc);
!         this.docsEnAttente.remove(idDoc);
          this.docsEnAttente.add(idDoc);
      }
--- 295,305 ----
       */
      public void addNouveauDocEnAttente(final String idDoc) {
!         if (this.docsPrives.contains(idDoc))
!             this.docsPrives.remove(idDoc);
!         if (this.docsRefuses.contains(idDoc))
!             this.docsRefuses.remove(idDoc);
!         if (this.docsEnAttente.contains(idDoc))
!             this.docsEnAttente.remove(idDoc);
! 
          this.docsEnAttente.add(idDoc);
      }
***************
*** 307,312 ****
       */
      public void addNouveauDocPrive(final String idDoc) {
!         this.docsRefuses.remove(idDoc);
!         this.docsPrives.remove(idDoc);
          this.docsPrives.add(idDoc);
      }
--- 311,319 ----
       */
      public void addNouveauDocPrive(final String idDoc) {
!         if (this.docsRefuses.contains(idDoc))
!             this.docsRefuses.remove(idDoc);
!         if (this.docsPrives.contains(idDoc))
!             this.docsPrives.remove(idDoc);
! 
          this.docsPrives.add(idDoc);
      }
***************
*** 318,324 ****
       */
      public void addNouveauDocAccepte(final String idDoc) {
!         this.docsAcceptes.remove(idDoc);
          this.docsAcceptes.add(idDoc);
-         this.docsEnAttente.remove(idDoc);
      }
  
--- 325,334 ----
       */
      public void addNouveauDocAccepte(final String idDoc) {
!         if (this.docsEnAttente.contains(idDoc))
!             this.docsEnAttente.remove(idDoc);
!         if (this.docsAcceptes.contains(idDoc))
!             this.docsAcceptes.remove(idDoc);
! 
          this.docsAcceptes.add(idDoc);
      }
  
***************
*** 329,336 ****
       */
      public void addNouveauRefuse(final String idDoc) {
!         this.docsPrives.remove(idDoc);
!         this.docsRefuses.remove(idDoc);
          this.docsRefuses.add(idDoc);
-         this.docsEnAttente.remove(idDoc);
      }
  
--- 339,350 ----
       */
      public void addNouveauRefuse(final String idDoc) {
!         if (this.docsPrives.contains(idDoc))
!             this.docsPrives.remove(idDoc);
!         if (this.docsRefuses.contains(idDoc))
!             this.docsRefuses.remove(idDoc);
!         if (this.docsEnAttente.contains(idDoc))
!             this.docsEnAttente.remove(idDoc);
! 
          this.docsRefuses.add(idDoc);
      }
  
***************
*** 341,347 ****
       */
      public void removeDocFromAllCollection(final String idDoc) {
!         this.docsRefuses.remove(idDoc);
!         this.docsPrives.remove(idDoc);
!         this.docsAcceptes.remove(idDoc);
          this.docsEnAttente.remove(idDoc);
      }
--- 355,364 ----
       */
      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);
      }