[Castore-commits] CollectionBean.java 1.11 1.12 DocumentBean.java 1.17 1.18

[Stéphane Bouchet]

Update of /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/users
In directory adullact1:/tmp/cvs-serv329/src/java/fr/emn/castor/struts/forms/users

Modified Files:
	CollectionBean.java DocumentBean.java 
Log Message:
Modif logique Workflow

Index: CollectionBean.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/users/CollectionBean.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CollectionBean.java	24 Apr 2006 17:56:55 -0000	1.11
--- CollectionBean.java	16 May 2006 15:32:21 -0000	1.12
***************
*** 51,56 ****
  import fr.emn.castor.collections.ICollection;
  import fr.emn.castor.common.Constants;
- import fr.emn.castor.documents.DocumentsConstants;
  import fr.emn.castor.documents.Facade;
  import fr.emn.castor.servlets.common.CastorProxy;
  import fr.emn.castor.users.UsersException;
--- 51,56 ----
  import fr.emn.castor.collections.ICollection;
  import fr.emn.castor.common.Constants;
  import fr.emn.castor.documents.Facade;
+ import fr.emn.castor.documents.DocumentsConstants.StateEnum;
  import fr.emn.castor.servlets.common.CastorProxy;
  import fr.emn.castor.users.UsersException;
***************
*** 284,288 ****
      private String getBeanState(String idDoc) {
          Facade docFac = Facade.getInstance();
!         String docState = null;
          try {
              docState = docFac.getStateOfDoc(idDoc);
--- 284,288 ----
      private String getBeanState(String idDoc) {
          Facade docFac = Facade.getInstance();
!         StateEnum docState = null;
          try {
              docState = docFac.getStateOfDoc(idDoc);
***************
*** 294,302 ****
              }
          }
!         if (docState.equals(DocumentsConstants.PRIVATE)) {
              return DocumentBean.ETAT_DOC_PRV;
!         } else if (docState.equals(DocumentsConstants.VALIDATED)) {
              return DocumentBean.ETAT_DOC_ACPT;
!         } else if (docState.equals(DocumentsConstants.REFUSED)) {
              return DocumentBean.ETAT_DOC_RFS;
          } else {
--- 294,302 ----
              }
          }
!         if (docState == StateEnum.PRIVATE) {
              return DocumentBean.ETAT_DOC_PRV;
!         } else if (docState == StateEnum.VALIDATED) {
              return DocumentBean.ETAT_DOC_ACPT;
!         } else if (docState == StateEnum.REFUSED) {
              return DocumentBean.ETAT_DOC_RFS;
          } else {

Index: DocumentBean.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/users/DocumentBean.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DocumentBean.java	11 May 2006 13:43:46 -0000	1.17
--- DocumentBean.java	16 May 2006 15:32:21 -0000	1.18
***************
*** 243,248 ****
                  this.canSeeNotice = true;
                  this.canSendToBasket = true;
!                 if (docFac.canSeeDocument(this.docId, userOnLine).equals(
!                     VraiFauxEnum.VRAI)) {
                      this.canSeeDocument = true;
                      this.canDownload = true;
--- 243,248 ----
                  this.canSeeNotice = true;
                  this.canSendToBasket = true;
!                 if (docFac.canSeeDocument(this.docId, userOnLine)==
!                     VraiFauxEnum.VRAI) {
                      this.canSeeDocument = true;
                      this.canDownload = true;