Author: tchemit Date: 2008-01-24 20:38:22 +0000 (Thu, 24 Jan 2008) New Revision: 509 Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java Log: foreach et simplify test Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-01-24 20:37:52 UTC (rev 508) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-01-24 20:38:22 UTC (rev 509) @@ -77,9 +77,7 @@ return false; } Iterator<Group> iterator2 = groups2.iterator(); - for (Iterator<Group> iterator1 = groups1.iterator(); iterator1 - .hasNext();) { - Group group1 = iterator1.next(); + for (Group group1 : groups1) { Group group2 = iterator2.next(); if (group1 == null) { if (group2 != null) Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java 2008-01-24 20:37:52 UTC (rev 508) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java 2008-01-24 20:38:22 UTC (rev 509) @@ -110,9 +110,7 @@ return false; } else if (!passwordHash.equals(other.passwordHash)) return false; - if (superAdmin != other.superAdmin) - return false; - return true; + return superAdmin == other.superAdmin; } }