[Castore-commits] MesDocumentsBean.java 1.9 1.10
MesGroupesForm.java 1.4 1.5 AccueilBean.java 1.8 1.9
Arnaud Thimel
thimel at adullact1.hosting.cri74.org
Jeu 18 Mai 17:42:46 CEST 2006
Update of /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/users
In directory adullact1:/tmp/cvs-serv24993/src/java/fr/emn/castor/struts/forms/users
Modified Files:
MesDocumentsBean.java MesGroupesForm.java AccueilBean.java
Log Message:
Suppressions de quelques iterators restants
Index: MesGroupesForm.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/users/MesGroupesForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MesGroupesForm.java 9 Mar 2006 11:21:52 -0000 1.4
--- MesGroupesForm.java 18 May 2006 15:42:44 -0000 1.5
***************
*** 43,46 ****
--- 43,47 ----
import java.util.Collection;
import java.util.Iterator;
+ import java.util.List;
import java.util.Map;
***************
*** 140,147 ****
.getInstance().getProfilMap(login);
if (!profilMap.isEmpty()) {
! Iterator iter = (Iterator) profilMap
! .get(UsersConstants.INFO_PROFIL_GROUPES_APPARTENANCE);
while (iter.hasNext()) {
! String groupId = (String) iter.next();
Map element = Facade.getInstance().getGroupe(groupId);
if (!element.isEmpty()) {
--- 141,148 ----
.getInstance().getProfilMap(login);
if (!profilMap.isEmpty()) {
! Iterator<String> iter = ((List<String>) profilMap
! .get(UsersConstants.INFO_PROFIL_GROUPES_APPARTENANCE)).iterator();
while (iter.hasNext()) {
! String groupId = iter.next();
Map element = Facade.getInstance().getGroupe(groupId);
if (!element.isEmpty()) {
***************
*** 167,174 ****
}
// on recherche les groupes dont l'utilisateur est le createur
! Iterator iterCreateurGroupes = (Iterator) profilMap
! .get(UsersConstants.INFO_PROFIL_GROUPES_PERSO);
while (iterCreateurGroupes.hasNext()) {
! String groupeId = (String) iterCreateurGroupes.next();
this.groupesCreateur.add(Facade.getInstance().getGroupe(
groupeId));
--- 168,175 ----
}
// on recherche les groupes dont l'utilisateur est le createur
! Iterator<String> iterCreateurGroupes = ((List<String>) profilMap
! .get(UsersConstants.INFO_PROFIL_GROUPES_PERSO)).iterator();
while (iterCreateurGroupes.hasNext()) {
! String groupeId = iterCreateurGroupes.next();
this.groupesCreateur.add(Facade.getInstance().getGroupe(
groupeId));
Index: MesDocumentsBean.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/users/MesDocumentsBean.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MesDocumentsBean.java 20 Apr 2006 08:52:12 -0000 1.9
--- MesDocumentsBean.java 18 May 2006 15:42:44 -0000 1.10
***************
*** 42,45 ****
--- 42,46 ----
import java.util.ArrayList;
import java.util.Iterator;
+ import java.util.List;
import java.util.Map;
***************
*** 115,132 ****
Map profilMap = profilFacade.getProfilMap(user);
if (!profilMap.isEmpty()) {
! Iterator idDocsAcceptes = (Iterator) profilMap
! .get(UsersConstants.INFO_PROFIL_DOCS_ACCEPTES);
while (idDocsAcceptes.hasNext()) {
this.existeDocsPublics = "true";
! String idDoc = (String) idDocsAcceptes.next();
DocumentBean doc = new DocumentBean(
idDoc, user, DocumentBean.ETAT_DOC_ACPT);
this.documentsPublics.add(doc);
}
! Iterator idDocsRefuses = (Iterator) profilMap
! .get(UsersConstants.INFO_PROFIL_DOCS_REFUSES);
while (idDocsRefuses.hasNext()) {
this.existeDocsPublics = "true";
! String idDoc = (String) idDocsRefuses.next();
try {
DocumentBean doc = new DocumentBean(
--- 116,133 ----
Map profilMap = profilFacade.getProfilMap(user);
if (!profilMap.isEmpty()) {
! Iterator<String> idDocsAcceptes = ((List<String>) profilMap
! .get(UsersConstants.INFO_PROFIL_DOCS_ACCEPTES)).iterator();
while (idDocsAcceptes.hasNext()) {
this.existeDocsPublics = "true";
! String idDoc = idDocsAcceptes.next();
DocumentBean doc = new DocumentBean(
idDoc, user, DocumentBean.ETAT_DOC_ACPT);
this.documentsPublics.add(doc);
}
! Iterator<String> idDocsRefuses = ((List<String>) profilMap
! .get(UsersConstants.INFO_PROFIL_DOCS_REFUSES)).iterator();
while (idDocsRefuses.hasNext()) {
this.existeDocsPublics = "true";
! String idDoc = idDocsRefuses.next();
try {
DocumentBean doc = new DocumentBean(
***************
*** 141,149 ****
}
}
! Iterator idDocsEnAttente = (Iterator) profilMap
! .get(UsersConstants.INFO_PROFIL_DOCS_ENATTENTE);
while (idDocsEnAttente.hasNext()) {
this.existeDocsPublics = "true";
! String idDoc = (String) idDocsEnAttente.next();
try {
DocumentBean doc = new DocumentBean(
--- 142,150 ----
}
}
! Iterator<String> idDocsEnAttente = ((List<String>) profilMap
! .get(UsersConstants.INFO_PROFIL_DOCS_ENATTENTE)).iterator();
while (idDocsEnAttente.hasNext()) {
this.existeDocsPublics = "true";
! String idDoc = idDocsEnAttente.next();
try {
DocumentBean doc = new DocumentBean(
***************
*** 159,167 ****
}
//recuperation de tous les documents prives
! Iterator idsDocsPrives = (Iterator) profilMap
! .get(UsersConstants.INFO_PROFIL_DOCS_PRIVES);
while (idsDocsPrives.hasNext()) {
this.existeDocsPrives = "true";
! String idDoc = (String) idsDocsPrives.next();
try {
DocumentBean doc = new DocumentBean(
--- 160,168 ----
}
//recuperation de tous les documents prives
! Iterator<String> idsDocsPrives = ((List<String>) profilMap
! .get(UsersConstants.INFO_PROFIL_DOCS_PRIVES)).iterator();
while (idsDocsPrives.hasNext()) {
this.existeDocsPrives = "true";
! String idDoc = idsDocsPrives.next();
try {
DocumentBean doc = new DocumentBean(
Index: AccueilBean.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/users/AccueilBean.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AccueilBean.java 20 Apr 2006 08:52:12 -0000 1.8
--- AccueilBean.java 18 May 2006 15:42:44 -0000 1.9
***************
*** 47,50 ****
--- 47,51 ----
import java.util.Collection;
import java.util.Iterator;
+ import java.util.List;
import java.util.Map;
***************
*** 275,285 ****
this.nbDocsPrives = (String) profilMap
.get(UsersConstants.INFO_PROFIL_NB_DOCS_PRIVES);
! Iterator liens = (Iterator) profilMap
! .get(UsersConstants.INFO_PROFIL_DERNIERS_DOCS_LUS);
if (liens != null) {
this.derniersLiens = new ArrayList();
Facade docFac = Facade.getInstance();
while (liens.hasNext()) {
! String idDoc = (String) liens.next();
LabelValueBean labelDoc = new LabelValueBean(docFac
.getNameDoc(idDoc), idDoc);
--- 276,286 ----
this.nbDocsPrives = (String) profilMap
.get(UsersConstants.INFO_PROFIL_NB_DOCS_PRIVES);
! Iterator<String> liens = ((List<String>) profilMap
! .get(UsersConstants.INFO_PROFIL_DERNIERS_DOCS_LUS)).iterator();
if (liens != null) {
this.derniersLiens = new ArrayList();
Facade docFac = Facade.getInstance();
while (liens.hasNext()) {
! String idDoc = liens.next();
LabelValueBean labelDoc = new LabelValueBean(docFac
.getNameDoc(idDoc), idDoc);
***************
*** 288,293 ****
}
! Iterator colls = (Iterator) profilMap
! .get(UsersConstants.INFO_PROFIL_DERNIERS_COLLECTIONS_CONSULTEES);
if (colls != null) {
this.dernieresCollections = new ArrayList();
--- 289,294 ----
}
! Iterator colls = ((List) profilMap
! .get(UsersConstants.INFO_PROFIL_DERNIERS_COLLECTIONS_CONSULTEES)).iterator();
if (colls != null) {
this.dernieresCollections = new ArrayList();
Plus d'informations sur la liste de diffusion Castore-commits