[Castore-commits] AjoutDocDepuisPanierForm.java 1.7 1.8 GestionCollectionsForm.java 1.9 1.10 NavigationForm.java 1.9 1.10

[Stéphane Bouchet]

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

Modified Files:
	AjoutDocDepuisPanierForm.java GestionCollectionsForm.java 
	NavigationForm.java 
Log Message:
Modif logique Workflow

Index: NavigationForm.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/collections/NavigationForm.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NavigationForm.java	24 Apr 2006 17:57:44 -0000	1.9
--- NavigationForm.java	16 May 2006 15:31:30 -0000	1.10
***************
*** 54,58 ****
  import fr.emn.castor.collections.ICollection;
  import fr.emn.castor.common.Constants;
! import fr.emn.castor.documents.DocumentsConstants;
  import fr.emn.castor.servlets.common.CastorProxy;
  import fr.emn.castor.struts.common.session.SessionTreeNodeMaintenance;
--- 54,58 ----
  import fr.emn.castor.collections.ICollection;
  import fr.emn.castor.common.Constants;
! import fr.emn.castor.documents.DocumentsConstants.StateEnum;
  import fr.emn.castor.servlets.common.CastorProxy;
  import fr.emn.castor.struts.common.session.SessionTreeNodeMaintenance;
***************
*** 233,237 ****
          fr.emn.castor.documents.Facade docFac = fr.emn.castor.documents.Facade
              .getInstance();
!         String docState = null;
          try {
              docState = docFac.getStateOfDoc(idDoc);
--- 233,237 ----
          fr.emn.castor.documents.Facade docFac = fr.emn.castor.documents.Facade
              .getInstance();
!         StateEnum docState = null;
          try {
              docState = docFac.getStateOfDoc(idDoc);
***************
*** 243,251 ****
              }
          }
!         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 {
--- 243,251 ----
              }
          }
!         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: GestionCollectionsForm.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/collections/GestionCollectionsForm.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GestionCollectionsForm.java	24 Apr 2006 17:57:44 -0000	1.9
--- GestionCollectionsForm.java	16 May 2006 15:31:30 -0000	1.10
***************
*** 55,59 ****
  import fr.emn.castor.collections.ICollection;
  import fr.emn.castor.common.Constants;
! import fr.emn.castor.documents.DocumentsConstants;
  import fr.emn.castor.servlets.common.CastorProxy;
  import fr.emn.castor.struts.common.session.SessionTreeNodeMaintenance;
--- 55,59 ----
  import fr.emn.castor.collections.ICollection;
  import fr.emn.castor.common.Constants;
! import fr.emn.castor.documents.DocumentsConstants.StateEnum;
  import fr.emn.castor.servlets.common.CastorProxy;
  import fr.emn.castor.struts.common.session.SessionTreeNodeMaintenance;
***************
*** 249,253 ****
              .getInstance();
          //        DocumentsProxy fDoc = CastorProxy.getModuleDocuments(session);
!         String docState = null;
          try {
              docState = docFac.getStateOfDoc(idDoc);
--- 249,253 ----
              .getInstance();
          //        DocumentsProxy fDoc = CastorProxy.getModuleDocuments(session);
!         StateEnum docState = null;
          try {
              docState = docFac.getStateOfDoc(idDoc);
***************
*** 259,267 ****
              }
          }
!         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 {
--- 259,267 ----
              }
          }
!         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: AjoutDocDepuisPanierForm.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/collections/AjoutDocDepuisPanierForm.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AjoutDocDepuisPanierForm.java	20 Apr 2006 08:55:08 -0000	1.7
--- AjoutDocDepuisPanierForm.java	16 May 2006 15:31:30 -0000	1.8
***************
*** 51,56 ****
  import org.apache.struts.action.ActionMessage;
  
! import fr.emn.castor.admin.ImportTool;
! import fr.emn.castor.documents.DocumentsConstants;
  import fr.emn.castor.struts.common.session.SessionTreeNodeMaintenance;
  import fr.emn.castor.struts.common.tree.ChBoxTreeNode;
--- 51,55 ----
  import org.apache.struts.action.ActionMessage;
  
! import fr.emn.castor.documents.DocumentsConstants.StateEnum;
  import fr.emn.castor.struts.common.session.SessionTreeNodeMaintenance;
  import fr.emn.castor.struts.common.tree.ChBoxTreeNode;
***************
*** 92,98 ****
  
          try {
!             String typeDoc = fDoc.getStateOfDoc(this.idDoc);
  
!             if (typeDoc.equals(DocumentsConstants.PRIVATE)) {
                  this.showPublicColls = "false";
              } else {
--- 91,97 ----
  
          try {
!             StateEnum typeDoc = fDoc.getStateOfDoc(this.idDoc);
  
!             if (typeDoc== StateEnum.PRIVATE) {
                  this.showPublicColls = "false";
              } else {