Author: radu Date: Wed Jul 15 09:49:39 2015 New Revision: 1691152 URL: http://svn.apache.org/r1691152 Log: trivial: updated JavaDoc to comply with Java 1.8
Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java?rev=1691152&r1=1691151&r2=1691152&view=diff ============================================================================== --- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java (original) +++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java Wed Jul 15 09:49:39 2015 @@ -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); Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java?rev=1691152&r1=1691151&r2=1691152&view=diff ============================================================================== --- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java (original) +++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java Wed Jul 15 09:49:39 2015 @@ -47,7 +47,7 @@ public class MergedValueMap extends Valu /** * 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>());