dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17799
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-12-25 16:08:25 +0100
message:
  Javadoc
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroupStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.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-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroupStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroupStore.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroupStore.java	2014-12-25 15:08:25 +0000
@@ -37,5 +37,12 @@
 public interface UserAuthorityGroupStore
     extends GenericIdentifiableObjectStore<UserAuthorityGroup>
 {
+    /**
+     * Returns the number of UserAuthorityGroups which are associated with the
+     * given DataSet.
+     *  
+     * @param dataSet the DataSet.
+     * @return number of UserAuthorityGroups.
+     */
     int countDataSetUserAuthorityGroups( DataSet dataSet );
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java	2014-12-25 15:05:06 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java	2014-12-25 15:08:25 +0000
@@ -184,8 +184,6 @@
      */
     List<User> getManagedUsers( User user, int first, int max );
     
-    int countDataSetUserAuthorityGroups( DataSet dataSet );
-
     /**
      * Tests whether the current user is allowed to create a user associated
      * with the given user group identifiers. Returns true if current user has 
@@ -419,6 +417,15 @@
      */
     Collection<UserAuthorityGroup> getUserRolesBetweenByName( String name, int first, int max );
 
+    /**
+     * Returns the number of UserAuthorityGroups which are associated with the
+     * given DataSet.
+     *  
+     * @param dataSet the DataSet.
+     * @return number of UserAuthorityGroups.
+     */
+    int countDataSetUserAuthorityGroups( DataSet dataSet );
+
     void assignDataSetToUserRole( DataSet dataSet );
 
     int getUserRoleCount();