dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19361
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-06-11 13:46:36 +0200
message:
  Collection to List in data admin
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewService.java
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.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/sqlview/SqlViewService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewService.java	2015-03-10 11:36:58 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewService.java	2015-06-11 11:46:36 +0000
@@ -29,6 +29,7 @@
  */
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -62,9 +63,9 @@
 
     int getSqlViewCount();
 
-    Collection<SqlView> getSqlViewsBetween( int first, int max );
+    List<SqlView> getSqlViewsBetween( int first, int max );
 
-    Collection<SqlView> getSqlViewsBetweenByName( String name, int first, int max );
+    List<SqlView> getSqlViewsBetweenByName( String name, int first, int max );
 
     SqlView getSqlView( int viewId );
 
@@ -72,9 +73,9 @@
 
     SqlView getSqlView( String viewName );
 
-    Collection<SqlView> getAllSqlViews();
+    List<SqlView> getAllSqlViews();
     
-    Collection<SqlView> getAllSqlViewsNoAcl();
+    List<SqlView> getAllSqlViewsNoAcl();
 
     int getSqlViewCountByName( String name );
     

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java	2015-05-05 08:34:06 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java	2015-06-11 11:46:36 +0000
@@ -28,8 +28,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -78,13 +78,13 @@
     }
 
     @Override
-    public Collection<SqlView> getAllSqlViews()
+    public List<SqlView> getAllSqlViews()
     {
         return sqlViewStore.getAll();
     }
 
     @Override
-    public Collection<SqlView> getAllSqlViewsNoAcl()
+    public List<SqlView> getAllSqlViewsNoAcl()
     {
         return sqlViewStore.getAllNoAcl();
     }
@@ -126,13 +126,13 @@
     }
 
     @Override
-    public Collection<SqlView> getSqlViewsBetween( int first, int max )
+    public List<SqlView> getSqlViewsBetween( int first, int max )
     {
         return sqlViewStore.getAllOrderedName( first, max );
     }
 
     @Override
-    public Collection<SqlView> getSqlViewsBetweenByName( String name, int first, int max )
+    public List<SqlView> getSqlViewsBetweenByName( String name, int first, int max )
     {
         return sqlViewStore.getAllLikeName( name, first, max );
     }