dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40704
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20689: Removed unused method
------------------------------------------------------------
revno: 20689
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-10-14 09:46:53 +0200
message:
Removed unused method
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.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/UserSettingService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java 2015-10-14 07:45:12 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java 2015-10-14 07:46:53 +0000
@@ -30,7 +30,6 @@
import java.io.Serializable;
import java.util.List;
-import java.util.Map;
/**
* The main interface for working with user settings. Implementation need to get
@@ -167,16 +166,6 @@
List<UserSetting> getUserSettings( String name );
/**
- * Returns a Map with an entry for all UserSettings with the given name where
- * the key is the user and the value is the value of the user setting.
- *
- * @param name the name of the UserSetting.
- * @param defaultValue the value to return if the UserSetting value is null.
- * @return a Map.
- */
- Map<User, Serializable> getUserSettings( String name, Serializable defaultValue );
-
- /**
* Returns the value of the user setting specified by the given name.
*
* @param name the name of the user setting.
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java 2015-10-14 07:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java 2015-10-14 07:46:53 +0000
@@ -30,15 +30,12 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.springframework.transaction.annotation.Transactional;
/**
* @author Torgeir Lorange Ostby
- * @version $Id: DefaultUserSettingService.java 5724 2008-09-18 14:37:01Z larshelg $
*/
@Transactional
public class DefaultUserSettingService
@@ -229,19 +226,6 @@
}
@Override
- public Map<User, Serializable> getUserSettings( String name, Serializable defaultValue )
- {
- Map<User, Serializable> map = new HashMap<>();
-
- for ( UserSetting setting : userSettingStore.getUserSettings( name ) )
- {
- map.put( setting.getUser(), setting.getValue() != null ? setting.getValue() : defaultValue );
- }
-
- return map;
- }
-
- @Override
public List<UserSetting> getAllUserSettings()
{
User currentUser = currentUserService.getCurrentUser();