=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/dashboard/DashboardStoreTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/dashboard/DashboardStoreTest.java	2012-01-22 05:35:16 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/dashboard/DashboardStoreTest.java	2012-06-25 19:23:38 +0000
@@ -37,17 +37,16 @@
 import org.hisp.dhis.report.Report;
 import org.hisp.dhis.report.ReportService;
 import org.hisp.dhis.user.User;
-import org.hisp.dhis.user.UserStore;
+import org.hisp.dhis.user.UserService;
 import org.junit.Test;
 
 /**
  * @author Lars Helge Overland
- * @version $Id$
  */
 public class DashboardStoreTest
     extends DhisSpringTest
 {
-    private UserStore userStore;
+    private UserService userService;
     
     private ReportService reportService;
     
@@ -64,14 +63,14 @@
     @SuppressWarnings("unchecked")
     public void setUpTest()
     {
-        userStore = (UserStore) getBean( UserStore.ID );
+        userService = (UserService) getBean( UserService.ID );
         
         reportService = (ReportService) getBean( ReportService.ID );
 
         dashboardContentStore = (GenericStore<DashboardContent>) getBean( "org.hisp.dhis.dashboard.DashboardContentStore" );
         
         userA = createUser( 'A' );
-        userStore.addUser( userA );
+        userService.addUser( userA );
         
         reportA = new Report( "ReportA", "DesignA", null );
         reportService.saveReport( reportA );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java	2012-06-14 18:28:59 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java	2012-06-25 19:23:38 +0000
@@ -63,7 +63,7 @@
         {
             if ( ReflectionUtils.isCollection( field.getName(), metaData, IdentifiableObject.class ) )
             {
-                List<IdentifiableObject> objects = new ArrayList( (Collection<IdentifiableObject>) ReflectionUtils.getFieldObject( field, metaData ) );
+                List<IdentifiableObject> objects = new ArrayList<IdentifiableObject>( (Collection<IdentifiableObject>) ReflectionUtils.getFieldObject( field, metaData ) );
 
                 if ( !objects.isEmpty() )
                 {

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resources.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resources.java	2012-06-14 18:28:59 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resources.java	2012-06-25 19:23:38 +0000
@@ -35,7 +35,6 @@
 import org.hisp.dhis.common.Dxf2Namespace;
 import org.hisp.dhis.common.IdentifiableObject;
 import org.hisp.dhis.dxf2.metadata.ExchangeClasses;
-import org.hisp.dhis.message.MessageConversations;
 import org.springframework.http.MediaType;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMethod;