svn commit: r1799573 - /sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker2.java

[kwin]

Author: kwin
Date: Thu Jun 22 12:25:29 2017
New Revision: 1799573

URL: http://svn.apache.org/viewvc?rev=1799573&view=rev
Log:
clarify relatedResource in Javadoc

Modified:
    
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker2.java

Modified: 
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker2.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker2.java?rev=1799573&r1=1799572&r2=1799573&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker2.java
 (original)
+++ 
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker2.java
 Thu Jun 22 12:25:29 2017
@@ -68,7 +68,7 @@ public interface MergedResourcePicker2 {
      *
      * @param resolver the ResourceResolver
      * @param relativePath the path relative to the merge root
-     * @param relatedResource an optional resource which is related to the 
given path (parent or child)
+     * @param relatedResource an optional resource which is related to the 
given path (always the parent resource or {@code null})
      * @return a List of Resource objects
      */
     List<Resource> pickResources(ResourceResolver resolver, String 
relativePath, Resource relatedResource);