From 415057c18445090185804ce9ee93fbdd5d3dddac Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 20 May 2011 03:48:19 +0000
Subject: [PATCH] Remove AbstractEnvironment#getPropertyResolver

Method is obsolete now that Environment (thus AbstractEnvironment as
well) implements the ConfigurablePropertyResolver interface.
---
 .../org/springframework/core/env/AbstractEnvironment.java     | 4 ----
 .../java/org/springframework/core/env/DefaultEnvironment.java | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
index eaf5f7592b..2604281502 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
@@ -123,10 +123,6 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 		return this.propertySources;
 	}
 
-	public ConfigurablePropertyResolver getPropertyResolver() {
-		return this.propertyResolver;
-	}
-
 	@SuppressWarnings("unchecked")
 	public Map<String, Object> getSystemEnvironment() {
 		Map<String, ?> systemEnvironment;
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/DefaultEnvironment.java b/org.springframework.core/src/main/java/org/springframework/core/env/DefaultEnvironment.java
index 408ea7c628..12e1c701ae 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/env/DefaultEnvironment.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/env/DefaultEnvironment.java
@@ -30,7 +30,7 @@ package org.springframework.core.env;
  *
  * That is, if the key "xyz" is present both in the JVM system properties as well as in the
  * set of environment variables for the current process, the value of key "xyz" from system properties
- * will return from a call to {@code environment.getPropertyResolver().getProperty("xyz")}.
+ * will return from a call to {@code environment.getProperty("xyz")}.
  * This ordering is chosen by default because system properties are per-JVM, while environment
  * variables may be the same across many JVMs on a given system.  Giving system properties
  * precedence allows for overriding of environment variables on a per-JVM basis.