[Castore-commits] RechercheAvanceeAction.java 1.8 1.9 RechercheSimpleAction.java 1.9 1.10

[Stéphane Bouchet]

Update of /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/actions/recherches
In directory adullact1:/tmp/cvs-serv32550/src/java/fr/emn/castor/struts/actions/recherches

Modified Files:
	RechercheAvanceeAction.java RechercheSimpleAction.java 
Log Message:
Modif logique Workflow

Index: RechercheSimpleAction.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/actions/recherches/RechercheSimpleAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RechercheSimpleAction.java	24 Apr 2006 17:58:13 -0000	1.9
--- RechercheSimpleAction.java	16 May 2006 15:30:51 -0000	1.10
***************
*** 42,46 ****
  import java.util.ArrayList;
  import java.util.HashMap;
- import java.util.Iterator;
  import java.util.List;
  
--- 42,45 ----
***************
*** 57,62 ****
  import fr.emn.castor.common.Constants;
  import fr.emn.castor.common.Utils;
- import fr.emn.castor.documents.DocumentsConstants;
  import fr.emn.castor.documents.IDocuments;
  import fr.emn.castor.recherche.IRecherche;
  import fr.emn.castor.recherche.RechercheConstants;
--- 56,61 ----
  import fr.emn.castor.common.Constants;
  import fr.emn.castor.common.Utils;
  import fr.emn.castor.documents.IDocuments;
+ import fr.emn.castor.documents.DocumentsConstants.StateEnum;
  import fr.emn.castor.recherche.IRecherche;
  import fr.emn.castor.recherche.RechercheConstants;
***************
*** 139,143 ****
          IDocuments fDoc = CastorProxy.getModuleDocuments(request
              .getSession());
!         String docState = null;
          try {
              docState = fDoc.getStateOfDoc(idDoc);
--- 138,142 ----
          IDocuments fDoc = CastorProxy.getModuleDocuments(request
              .getSession());
!         StateEnum docState = null;
          try {
              docState = fDoc.getStateOfDoc(idDoc);
***************
*** 149,157 ****
              }
          }
!         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 {
--- 148,156 ----
              }
          }
!         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: RechercheAvanceeAction.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/actions/recherches/RechercheAvanceeAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RechercheAvanceeAction.java	24 Apr 2006 17:58:13 -0000	1.8
--- RechercheAvanceeAction.java	16 May 2006 15:30:51 -0000	1.9
***************
*** 59,64 ****
  
  import fr.emn.castor.common.Utils;
- import fr.emn.castor.documents.DocumentsConstants;
  import fr.emn.castor.documents.IDocuments;
  import fr.emn.castor.groupes.IGroupe;
  import fr.emn.castor.recherche.IRecherche;
--- 59,64 ----
  
  import fr.emn.castor.common.Utils;
  import fr.emn.castor.documents.IDocuments;
+ import fr.emn.castor.documents.DocumentsConstants.StateEnum;
  import fr.emn.castor.groupes.IGroupe;
  import fr.emn.castor.recherche.IRecherche;
***************
*** 163,167 ****
          IDocuments fDoc = CastorProxy.getModuleDocuments(request
              .getSession());
!         String docState = null;
          try {
              docState = fDoc.getStateOfDoc(idDoc);
--- 163,167 ----
          IDocuments fDoc = CastorProxy.getModuleDocuments(request
              .getSession());
!         StateEnum docState = null;
          try {
              docState = fDoc.getStateOfDoc(idDoc);
***************
*** 173,181 ****
              }
          }
!         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 {
--- 173,181 ----
              }
          }
!         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 {