Author: tchemit Date: 2008-01-22 07:27:00 +0000 (Tue, 22 Jan 2008) New Revision: 391 Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java Log: utilisation m?\195?\169thodes du framework Collections for (Group group : groups) { result.add(group); } peut ?\195?\170tre remplac?\195?\169 par result.addAll(groups); La classe Collections poss?\195?\168dent des m?\195?\169thodes utiles pour la gestions des collections + autoboxing, en java 5 ?\195?\169crire Integer i = new Integer(0); n'est pas utile, Integer i=0 passe tout seul :) Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-01-22 07:24:16 UTC (rev 390) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-01-22 07:27:00 UTC (rev 391) @@ -2,7 +2,7 @@ import java.util.ArrayList; import java.util.List; -import java.util.StringTokenizer; +import java.util.Arrays; import javax.naming.NamingException; @@ -47,15 +47,11 @@ User[] users = RemoteSecurityService.getSecurityService() .getUsersOfGroup(group); - for (User user : users) { - this.usersInGroup.add(user); - } + this.usersInGroup.addAll(Arrays.asList(users)); Group[] groups = RemoteSecurityService.getSecurityService() .getGroupsOfGroup(group); - for (Group group : groups) { - this.groupsInGroup.add(group); - } + this.groupsInGroup.addAll(Arrays.asList(groups)); } } @@ -71,7 +67,7 @@ Integer[] usersIds = new Integer[usersInGroup.size()]; int i = 0; for (User user : usersInGroup) { - usersIds[i] = new Integer(user.getId()); + usersIds[i] = user.getId(); i++; } RemoteSecurityService.getSecurityService().setUsersOfGroup(group, @@ -80,7 +76,7 @@ Integer[] groupsIds = new Integer[groupsInGroup.size()]; i = 0; for (Group group : groupsInGroup) { - groupsIds[i] = new Integer(group.getId()); + groupsIds[i] = group.getId(); i++; } RemoteSecurityService.getSecurityService().setGroupsOfGroup(group, @@ -96,18 +92,14 @@ public List<User> getUsers() throws Exception { User[] users = RemoteSecurityService.getSecurityService().getUsers(); List<User> result = new ArrayList<User>(); - for (User user : users) { - result.add(user); - } + result.addAll(Arrays.asList(users)); return result; } public List<Group> getGroups() throws Exception { Group[] groups = RemoteSecurityService.getSecurityService().getGroups(); List<Group> result = new ArrayList<Group>(); - for (Group group : groups) { - result.add(group); - } + result.addAll(Arrays.asList(groups)); return result; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-01-22 07:24:16 UTC (rev 390) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-01-22 07:27:00 UTC (rev 391) @@ -45,7 +45,7 @@ } public Group[] getGroups() throws Exception { - Group[] groups = null; + Group[] groups; if (isUserSuperAdmin()) { groups = RemoteSecurityService.getSecurityService().getGroups(); } else { Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-01-22 07:24:16 UTC (rev 390) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-01-22 07:27:00 UTC (rev 391) @@ -49,7 +49,7 @@ } public User[] getUsers() throws Exception { - User[] users = null; + User[] users; users = RemoteSecurityService.getSecurityService().getUsers(); return users; }