Refactor: Put slicing of ArrayList into a separate method.

This should really be moved to ArrayList implementation.

svn path=/trunk/; revision=489

diff --git a/src/plugins/tracker/rygel-media-tracker.vala b/src/plugins/tracker/rygel-media-tracker.vala
index 08a900e..23b758c 100644 (file)
--- a/src/plugins/tracker/rygel-media-tracker.vala
+++ b/src/plugins/tracker/rygel-media-tracker.vala
@@ -214,20 +214,32 @@ public class Rygel.MediaTracker : ContentDirectory {
         } else if (offset >= child_count) {
             throw new ContentDirectoryError.NO_SUCH_OBJECT ("No such object");
         } else {
-            // Make sure we don't go beyond the limits
-            max_count %= (child_count - offset);
+            children = slice_object_list (this.containers,
+                                          offset,
+                                          max_count);
+        }
 
-            if (max_count == 0) {
-                max_count = child_count - offset;
-            }
+        return children;
+    }
 
-            children = new ArrayList<MediaObject> ();
-            for (int i = 0; i < max_count; i++) {
-                children.add (this.containers.get (i + (int) offset));
-            }
+    private ArrayList<MediaObject> slice_object_list (
+                                        ArrayList<MediaObject> list,
+                                        uint                   offset,
+                                        uint                   max_count) {
+        uint total = list.size;
+
+        var slice = new ArrayList<MediaObject> ();
+
+        if (max_count == 0 || max_count > (total - offset)) {
+            max_count = total - offset;
         }
 
-        return children;
+        slice = new ArrayList<MediaObject> ();
+        for (uint i = offset; i < total; i++) {
+            slice.add (list[(int) i]);
+        }
+
+        return slice;
     }
 }