[Castore-commits] ChangerProfilForm.java 1.4 1.5 CollectionBean.java 1.10 1.11 DocumentBean.java 1.15 1.16

[Arnaud Thimel]

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

Modified Files:
	ChangerProfilForm.java CollectionBean.java DocumentBean.java 
Log Message:
Modifications suite aux modifs sur la facade users

Index: ChangerProfilForm.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/users/ChangerProfilForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangerProfilForm.java	21 Mar 2006 14:08:07 -0000	1.4
--- ChangerProfilForm.java	24 Apr 2006 17:56:55 -0000	1.5
***************
*** 42,45 ****
--- 42,46 ----
  import java.util.Collection;
  import java.util.Iterator;
+ import java.util.List;
  import java.util.Map;
  
***************
*** 117,127 ****
      private void loadSystemGroups() {
          try {
!             Iterator groups = Facade.getInstance().listerGroupes();
              this.systemGroups = new ArrayList();
!             while (groups.hasNext()) {
!                 Map group = (Map) groups.next();
!                 String groupId = (String) group
                      .get(GroupesConstants.GROUPE_UTILISATEUR_ID);
!                 String groupName = (String) group
                      .get(GroupesConstants.GROUPE_UTILISATEUR_NOM);
                  Facade.getInstance().getNomGroupeFromId(groupId);
--- 118,127 ----
      private void loadSystemGroups() {
          try {
!             List<Map<String, String>> groups = Facade.getInstance().listerGroupes();
              this.systemGroups = new ArrayList();
!             for (Map<String, String> group : groups) {
!                 String groupId = group
                      .get(GroupesConstants.GROUPE_UTILISATEUR_ID);
!                 String groupName = group
                      .get(GroupesConstants.GROUPE_UTILISATEUR_NOM);
                  Facade.getInstance().getNomGroupeFromId(groupId);
***************
*** 136,146 ****
      private void updatePossibleUsers(final String groupId) {
  
!         Iterator usersInGroup = Facade.getInstance().getUsersFromGroupe(
              groupId);
          this.usersPossibleChoisis = new ArrayList();
!         while (usersInGroup.hasNext()) {
!             String userId = (String) usersInGroup.next();
!             this.usersPossibleChoisis.add(userId);
!         }
  
      }
--- 136,144 ----
      private void updatePossibleUsers(final String groupId) {
  
!         Collection<String> usersInGroup = Facade.getInstance().getUsersFromGroupe(
              groupId);
          this.usersPossibleChoisis = new ArrayList();
!         //TODO Doit-on vraiment faire une copie ?
!         this.usersPossibleChoisis.addAll(usersInGroup);
  
      }
***************
*** 160,164 ****
          this.selectedGroup = new String[1];
          this.selectedGroup[0] = "all";
!         Iterator allUsers = fr.emn.castor.users.Facade
              .getInstance().listUsers();
          //        //dans un 1er temps, on recupère les logins
--- 158,162 ----
          this.selectedGroup = new String[1];
          this.selectedGroup[0] = "all";
!         List<String> allUsers = fr.emn.castor.users.Facade
              .getInstance().listUsers();
          //        //dans un 1er temps, on recupère les logins
***************
*** 166,173 ****
          //                allUsers, this.inscrits);
          this.usersPossibleChoisis = new ArrayList();
!         while (allUsers.hasNext()) {
!             String loginTemp = (String) allUsers.next();
!             this.usersPossibleChoisis.add(loginTemp);
!         }
  
      }
--- 164,169 ----
          //                allUsers, this.inscrits);
          this.usersPossibleChoisis = new ArrayList();
!         //TODO Doit-on vraiment faire une copie ?
!         this.usersPossibleChoisis.addAll(allUsers);
  
      }

Index: CollectionBean.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/users/CollectionBean.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CollectionBean.java	20 Apr 2006 08:51:34 -0000	1.10
--- CollectionBean.java	24 Apr 2006 17:56:55 -0000	1.11
***************
*** 41,45 ****
  
  import java.util.ArrayList;
! import java.util.Iterator;
  import java.util.Map;
  
--- 41,45 ----
  
  import java.util.ArrayList;
! import java.util.List;
  import java.util.Map;
  
***************
*** 222,226 ****
          String name = null;
          String canDelete = null;
!         Iterator content = null;
  
          if (!collId.equals("panier")) {
--- 222,226 ----
          String name = null;
          String canDelete = null;
!         List<String> content = null;
  
          if (!collId.equals("panier")) {
***************
*** 241,247 ****
          this.setDocuments(new ArrayList());
  
!         while (content.hasNext()) {
              DocumentBean docBean = null;
-             String idDoc = (String) content.next();
              String docBeanState = this.getBeanState(idDoc);
              if (!collId.equals("panier")) {
--- 241,246 ----
          this.setDocuments(new ArrayList());
  
!         for (String idDoc : content) {
              DocumentBean docBean = null;
              String docBeanState = this.getBeanState(idDoc);
              if (!collId.equals("panier")) {

Index: DocumentBean.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/forms/users/DocumentBean.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DocumentBean.java	20 Apr 2006 08:52:12 -0000	1.15
--- DocumentBean.java	24 Apr 2006 17:56:55 -0000	1.16
***************
*** 42,46 ****
  import java.util.ArrayList;
  import java.util.Collection;
! import java.util.Iterator;
  import java.util.Map;
  
--- 42,46 ----
  import java.util.ArrayList;
  import java.util.Collection;
! import java.util.List;
  import java.util.Map;
  
***************
*** 258,265 ****
          fr.emn.castor.collections.Facade collFac = fr.emn.castor.collections.Facade
              .getInstance();
!         Iterator contenuPanier = collFac.contentOfPanier(userOnLine);
          boolean dejaDansPanier = false;
!         while (contenuPanier.hasNext()) {
!             String idDocDansPanier = (String) contenuPanier.next();
              if (idDocDansPanier.equals(idDoc)) {
                  dejaDansPanier = true;
--- 258,264 ----
          fr.emn.castor.collections.Facade collFac = fr.emn.castor.collections.Facade
              .getInstance();
!         List<String> contenuPanier = collFac.contentOfPanier(userOnLine);
          boolean dejaDansPanier = false;
!         for (String idDocDansPanier : contenuPanier) {
              if (idDocDansPanier.equals(idDoc)) {
                  dejaDansPanier = true;