Author: cziegeler
Date: Wed Nov 7 19:55:00 2012
New Revision: 1406775
URL: http://svn.apache.org/viewvc?rev=1406775&view=rev
Log:
SLING-2641 : Make listChildren() Iterable
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/Resource.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/Resource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/Resource.java?rev=1406775&r1=1406774&r2=1406775&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/Resource.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/Resource.java
Wed Nov 7 19:55:00 2012
@@ -81,13 +81,13 @@ public interface Resource extends Adapta
Iterator<Resource> listChildren();
/**
- * Returns an iterator of the direct children of this resource.
+ * Returns an iterable of the direct children of this resource.
* <p>
* This method is a convenience and returns exactly the same resources as
- * calling <code>getResourceResolver().listChildren(resource)</code>.
+ * calling <code>getResourceResolver().getChildren(resource)</code>.
*
* @since 2.2.0
- * @see ResourceResolver#listChildren(Resource)
+ * @see ResourceResolver#getChildren(Resource)
*/
Iterable<Resource> getChildren();
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java?rev=1406775&r1=1406774&r2=1406775&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
Wed Nov 7 19:55:00 2012
@@ -356,7 +356,7 @@ public interface ResourceResolver extend
Iterator<Resource> listChildren(Resource parent);
/**
- * Returns an <code>Iterator</code> of {@link Resource} objects loaded from
+ * Returns an <code>Iterable</code> of {@link Resource} objects loaded from
* the children of the given <code>Resource</code>.
* <p>
* This specification does not define what the term "child" means. This is
@@ -366,7 +366,7 @@ public interface ResourceResolver extend
* of the given <code>Resource</code>.
*
* @param parent The {@link Resource Resource} whose children are
requested.
- * @return An <code>Iterator</code> of {@link Resource} objects.
+ * @return An <code>Iterable</code> of {@link Resource} objects.
* @throws NullPointerException If <code>parent</code> is
<code>null</code>.
* @throws org.apache.sling.api.SlingException If any error occurs
acquiring
* the child resource iterator.
