=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SystemController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SystemController.java 2013-01-09 10:31:21 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SystemController.java 2013-03-16 10:13:34 +0000 @@ -72,7 +72,7 @@ //-------------------------------------------------------------------------- @RequestMapping(value = "/uid", method = RequestMethod.GET) - public void getUid( @RequestParam( required = false ) Integer n, HttpServletResponse response ) throws IOException + public void getUid( @RequestParam(required = false) Integer n, HttpServletResponse response ) throws IOException { response.setContentType( ContextUtils.CONTENT_TYPE_JSON ); @@ -98,8 +98,8 @@ JacksonUtils.toJson( response.getOutputStream(), codes ); } - @RequestMapping( value = "/tasks/{category}", method = RequestMethod.GET, produces = { "*/*", "application/json" } ) - public void getTaskJson( HttpServletResponse response, @PathVariable( "category" ) String category ) throws IOException + @RequestMapping(value = "/tasks/{category}", method = RequestMethod.GET, produces = { "*/*", "application/json" }) + public void getTaskJson( HttpServletResponse response, @PathVariable("category") String category ) throws IOException { List notifications = new ArrayList(); @@ -109,14 +109,14 @@ TaskId taskId = new TaskId( taskCategory, currentUserService.getCurrentUser() ); - notifications = notifier.getNotifications( taskId, taskCategory, null ); + notifications = notifier.getNotifications( taskId, null ); } JacksonUtils.toJson( response.getOutputStream(), notifications ); } - @RequestMapping( value = "/taskSummaries/{category}", method = RequestMethod.GET, produces = { "*/*", "application/json" } ) - public void getTaskSummaryJson( HttpServletResponse response, @PathVariable( "category" ) String category ) throws IOException + @RequestMapping(value = "/taskSummaries/{category}", method = RequestMethod.GET, produces = { "*/*", "application/json" }) + public void getTaskSummaryJson( HttpServletResponse response, @PathVariable("category") String category ) throws IOException { ImportSummary importSummary = new ImportSummary(); @@ -126,9 +126,9 @@ TaskId taskId = new TaskId( taskCategory, currentUserService.getCurrentUser() ); - importSummary = (ImportSummary) notifier.getTaskSummary( taskId, taskCategory ); + importSummary = (ImportSummary) notifier.getTaskSummary( taskId ); - notifier.clear( taskId, taskCategory ); + notifier.clear( taskId ); } JacksonUtils.toJson( response.getOutputStream(), importSummary );