dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17196
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-10-21 19:10:43 +0700
message:
  minor indent fix
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/UserSettingController.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-api/src/main/java/org/hisp/dhis/webapi/controller/UserSettingController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/UserSettingController.java	2014-08-14 05:46:19 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/UserSettingController.java	2014-10-21 12:10:43 +0000
@@ -28,6 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import org.hisp.dhis.system.util.LocaleUtils;
 import org.hisp.dhis.user.UserSettingService;
 import org.hisp.dhis.webapi.utils.ContextUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,8 +39,8 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+
 import javax.servlet.http.HttpServletResponse;
-import org.hisp.dhis.system.util.LocaleUtils;
 import java.io.Serializable;
 import java.util.Locale;
 
@@ -74,11 +75,14 @@
 
         value = value != null ? value : valuePayload;
 
-        if (username == null) {
-            userSettingService.saveUserSetting(key, valueToSet(key, value));
+        if ( username == null )
+        {
+            userSettingService.saveUserSetting( key, valueToSet( key, value ) );
 
-        } else {
-            userSettingService.saveUserSetting(key, valueToSet(key, value), username);
+        }
+        else
+        {
+            userSettingService.saveUserSetting( key, valueToSet( key, value ), username );
         }
 
         ContextUtils.okResponse( response, "User setting saved" );
@@ -87,7 +91,7 @@
     @RequestMapping( value = "/{key}", method = RequestMethod.GET, produces = ContextUtils.CONTENT_TYPE_TEXT )
     public @ResponseBody String getSystemSetting( @PathVariable( "key" ) String key, @RequestParam( value = "user", required = false ) String username )
     {
-        return username == null ? getStringValue(key, userSettingService.getUserSetting( key )) : getStringValue( key,userSettingService.getUserSetting( key, username ));
+        return username == null ? getStringValue( key, userSettingService.getUserSetting( key ) ) : getStringValue( key, userSettingService.getUserSetting( key, username ) );
     }
 
     @RequestMapping( value = "/{key}", method = RequestMethod.DELETE )
@@ -96,19 +100,23 @@
         userSettingService.deleteUserSetting( key );
     }
 
-    private Serializable valueToSet(String key, String value){
-        if (key.equals(UserSettingService.KEY_UI_LOCALE) || key.equals(UserSettingService.KEY_DB_LOCALE)) {
-            return LocaleUtils.getLocale(value);
-        } else {
+    private Serializable valueToSet( String key, String value )
+    {
+        if ( key.equals( UserSettingService.KEY_UI_LOCALE ) || key.equals( UserSettingService.KEY_DB_LOCALE ) )
+        {
+            return LocaleUtils.getLocale( value );
+        }
+        else
+        {
             return value;
         }
     }
 
-    private String getStringValue(String key, Serializable value) {
-        if (key.equals(UserSettingService.KEY_UI_LOCALE) || key.equals(UserSettingService.KEY_DB_LOCALE))
+    private String getStringValue( String key, Serializable value )
+    {
+        if ( key.equals( UserSettingService.KEY_UI_LOCALE ) || key.equals( UserSettingService.KEY_DB_LOCALE ) )
             return ((Locale) value).getLanguage();
         else
             return (String) value;
     }
-
 }