dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12662
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3945: whitespace fix
------------------------------------------------------------
revno: 3945
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-06-19 12:00:50 +0300
message:
whitespace fix
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.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-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java 2011-06-11 08:15:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java 2011-06-19 09:00:50 +0000
@@ -67,14 +67,14 @@
public void setSelectionManager( OrganisationUnitSelectionManager selectionManager )
{
this.selectionManager = selectionManager;
- }
+ }
private UserService userService;
public void setUserService( UserService userService )
{
this.userService = userService;
- }
+ }
private CurrentUserService currentUserService;
@@ -127,9 +127,10 @@
throws Exception
{
userAuthorityGroups = new ArrayList<UserAuthorityGroup>( userService.getAllUserAuthorityGroups() );
-
- FilterUtils.filter( userAuthorityGroups, new UserAuthorityGroupSubsetFilter( currentUserService.getCurrentUser() ) );
-
+
+ FilterUtils.filter( userAuthorityGroups,
+ new UserAuthorityGroupSubsetFilter( currentUserService.getCurrentUser() ) );
+
if ( id != null )
{
User user = userService.getUser( id );
@@ -138,8 +139,8 @@
{
selectionTreeManager.setSelectedOrganisationUnits( user.getOrganisationUnits() );
}
-
- userCredentials = userService.getUserCredentials( userService.getUser( id ) );
+
+ userCredentials = userService.getUserCredentials( userService.getUser( id ) );
userAuthorityGroups.removeAll( userCredentials.getUserAuthorityGroups() );
}
@@ -149,8 +150,8 @@
{
selectionTreeManager.setSelectedOrganisationUnits( selectionManager.getSelectedOrganisationUnits() );
}
- }
-
+ }
+
return SUCCESS;
}
}