From 088238443b577f1cb291c869ac6f2cf616fd5591 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 27 Feb 2015 21:37:37 +0100 Subject: [PATCH] Polish Javadoc for ResourcePropertySource --- .../core/io/support/ResourcePropertySource.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/io/support/ResourcePropertySource.java b/spring-core/src/main/java/org/springframework/core/io/support/ResourcePropertySource.java index 35caf17375..94cdb55294 100644 --- a/spring-core/src/main/java/org/springframework/core/io/support/ResourcePropertySource.java +++ b/spring-core/src/main/java/org/springframework/core/io/support/ResourcePropertySource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,13 +26,14 @@ import org.springframework.core.io.Resource; import org.springframework.util.StringUtils; /** - * Subclass of {@link PropertiesPropertySource} that loads a {@link Properties} - * object from a given {@link org.springframework.core.io.Resource} or resource location such as + * Subclass of {@link PropertiesPropertySource} that loads a {@link Properties} object + * from a given {@link org.springframework.core.io.Resource} or resource location such as * {@code "classpath:/com/myco/foo.properties"} or {@code "file:/path/to/file.xml"}. - * Both traditional and XML-based properties file formats are supported, however in order - * for XML processing to take effect, the underlying {@code Resource}'s + * + *

Both traditional and XML-based properties file formats are supported; however, in + * order for XML processing to take effect, the underlying {@code Resource}'s * {@link org.springframework.core.io.Resource#getFilename() getFilename()} method must - * return non-{@code null} and end in ".xml". + * return a non-{@code null} value that ends in {@code ".xml"}. * * @author Chris Beams * @author Juergen Hoeller @@ -168,7 +169,7 @@ public class ResourcePropertySource extends PropertiesPropertySource { /** - * Return the description String for the given Resource; it the description is + * Return the description for the given Resource; if the description is * empty, return the class name of the resource plus its identity hash code. * @see org.springframework.core.io.Resource#getDescription() */