This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.3.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git
commit b55f5014112f62fe6d59fa700f8eac1dc7a17339 Author: Konrad Windszus <[email protected]> AuthorDate: Sun Feb 5 09:04:06 2017 +0000 fix some javadoc git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1781725 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/resourcemerger/impl/MergingResourceProvider.java | 2 +- .../apache/sling/resourcemerger/spi/MergedResourcePicker.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java b/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java index 318529d..1628a3a 100644 --- a/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java +++ b/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java @@ -83,7 +83,7 @@ public class MergingResourceProvider extends ResourceProvider<Void> { /** * * @param parent the underlying resource - * @param traverseParent + * @param traverseParent if true will also continue with the parent's parent recursively */ public ParentHidingHandler(final Resource parent, final boolean traverseParent) { // evaluate the sling:hideChildren property on the current resource diff --git a/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker.java b/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker.java index 2616339..2c3e9e5 100644 --- a/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker.java +++ b/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker.java @@ -30,7 +30,7 @@ import aQute.bnd.annotation.ConsumerType; * Service interface which can be implemented to define an algorithm used to pick * resources to be merged. For each picker service, a separate {@link ResourceProviderFactory} * will be exposed at the MERGE_ROOT of the picker. - * @deprecated + * @deprecated Use new {@link MergedResourcePicker2} instead. */ @Deprecated @ConsumerType @@ -61,7 +61,14 @@ public interface MergedResourcePicker { String TRAVERSE_PARENT = MergedResourcePicker2.TRAVERSE_PARENT; /** - * @see #pickResources(ResourceResolver, String, Resource) + * Method invoked by the MergingResourceProvider to identify the resources to be merged for a given + * relative path. The resources returned may be either resources returned from the ResourceResolver + * directory or an instance of NonExistingResource. + * + * @param resolver the ResourceResolver + * @param relativePath the path relative to the merge root + * @return a List of Resource objects + * @see MergedResourcePicker2#pickResources(ResourceResolver, String, Resource) */ List<Resource> pickResources(ResourceResolver resolver, String relativePath); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
