[sling-org-apache-sling-resourcemerger] 29/31: trivial: updated JavaDoc to comply with Java 1.8

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git

commit ce83fb121cd9bf1365f0cdf8aeed13e06957e539
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Wed Jul 15 09:49:39 2015 +0000

    trivial: updated JavaDoc to comply with Java 1.8
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1691152 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/sling/resourcemerger/api/ResourceMergerService.java | 2 +-
 src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java b/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java
index 62e178d..c13081c 100644
--- a/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java
+++ b/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java
@@ -35,7 +35,7 @@ public interface ResourceMergerService {
      *
      * @param relativePath The relative path
      * @return Returns the merged resource path
-     * @throw IllegalArgumentException if relativePath is <code>null</code> or absolute
+     * @throws IllegalArgumentException if relativePath is <code>null</code> or absolute
      */
     String getMergedResourcePath(String relativePath);
 
diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java b/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java
index 764feb4..d0bfe6b 100644
--- a/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java
+++ b/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java
@@ -47,7 +47,7 @@ public class MergedValueMap extends ValueMapDecorator {
     /**
      * Constructor
      *
-     * @param resource The merged resource to get properties from
+     * @param valueMaps a list of value maps to be aggregated into <i>this</i> value map
      */
     public MergedValueMap(final List<ValueMap> valueMaps) {
         super(new HashMap<String, Object>());

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.