dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17813
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-12-28 17:09:37 +0100
message:
  Fix to UserDeletionHandler
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserDeletionHandler.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserDeletionHandler.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserDeletionHandler.java	2014-12-28 16:09:37 +0000
@@ -28,14 +28,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.Iterator;
-
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.system.deletion.DeletionHandler;
 
 /**
  * @author Lars Helge Overland
- * @version $Id$
  */
 public class UserDeletionHandler
     extends DeletionHandler
@@ -64,11 +61,8 @@
     @Override
     public void deleteUserAuthorityGroup( UserAuthorityGroup authorityGroup )
     {
-        Iterator<UserCredentials> iterator = authorityGroup.getMembers().iterator();
-        
-        while ( iterator.hasNext() )
+        for ( UserCredentials credentials : authorityGroup.getMembers() )
         {
-            UserCredentials credentials = iterator.next();
             credentials.getUserAuthorityGroups().remove( authorityGroup );
             userService.updateUserCredentials( credentials );
         }
@@ -77,17 +71,24 @@
     @Override
     public void deleteOrganisationUnit( OrganisationUnit unit )
     {
-        Iterator<User> iterator = unit.getUsers().iterator();
-        
-        while ( iterator.hasNext() )
+        for ( User user : unit.getUsers() )
         {
-            User user = iterator.next();
             user.getOrganisationUnits().remove( unit );
             userService.updateUser( user );
         }
     }
 
     @Override
+    public void deleteUserGroup( UserGroup group )
+    {        
+        for ( User user : group.getMembers() )
+        {
+            user.getGroups().remove( user );
+            userService.updateUser( user );
+        }
+    }
+
+    @Override
     public String allowDeleteUserAuthorityGroup( UserAuthorityGroup authorityGroup )
     {
         for ( UserCredentials credentials : userService.getAllUserCredentials() )
@@ -103,17 +104,4 @@
 
         return null;
     }
-    
-    @Override
-    public void deleteUserGroup( UserGroup group )
-    {
-        Iterator<User> iterator = group.getMembers().iterator();
-        
-        while ( iterator.hasNext() )
-        {
-            User user = iterator.next();
-            user.getGroups().remove( user );
-            userService.updateUser( user );
-        }
-    }
 }