From 3d91946b73d3db01cf91b2374e8eb79279e189fc Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 2 Jun 2011 06:50:00 +0000
Subject: [PATCH] Polish ConfigurablePropertyResolver Javadoc

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4405 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../core/env/AbstractPropertyResolver.java           | 12 ++++++++++++
 .../core/env/ConfigurablePropertyResolver.java       | 11 +++++++++++
 2 files changed, 23 insertions(+)

diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java b/org.springframework.core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java
index 6b72de71aec..bf943b01e45 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java
@@ -104,14 +104,26 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
 		return value;
 	}
 
+	/**
+	 * {@inheritDoc} The default is "${".
+	 * @see org.springframework.util.SystemPropertyUtils#PLACEHOLDER_PREFIX
+	 */
 	public void setPlaceholderPrefix(String placeholderPrefix) {
 		this.placeholderPrefix = placeholderPrefix;
 	}
 
+	/**
+	 * {@inheritDoc} The default is "}".
+	 * @see org.springframework.util.SystemPropertyUtils#PLACEHOLDER_SUFFIX
+	 */
 	public void setPlaceholderSuffix(String placeholderSuffix) {
 		this.placeholderSuffix = placeholderSuffix;
 	}
 
+	/**
+	 * {@inheritDoc} The default is ":".
+	 * @see org.springframework.util.SystemPropertyUtils#VALUE_SEPARATOR
+	 */
 	public void setValueSeparator(String valueSeparator) {
 		this.valueSeparator = valueSeparator;
 	}
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java b/org.springframework.core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java
index e698f8d8f51..c3b1bd38171 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java
@@ -44,10 +44,21 @@ public interface ConfigurablePropertyResolver extends PropertyResolver {
 	 */
 	void setConversionService(ConversionService conversionService);
 
+	/**
+	 * Set the prefix that placeholders replaced by this resolver must begin with.
+	 */
 	void setPlaceholderPrefix(String placeholderPrefix);
 
+	/**
+	 * Set the suffix that placeholders replaced by this resolver must end with.
+	 */
 	void setPlaceholderSuffix(String placeholderSuffix);
 
+	/**
+	 * Specify the separating character between the placeholders replaced by this
+	 * resolver and their associated default value, or {@code null} if no such
+	 * special character should be processed as a value separator.
+	 */
 	void setValueSeparator(String valueSeparator);
 
 	/**