From 780b32c909533a73e60bde6830afd892d6c93a3c Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 10 Feb 2011 13:33:09 +0000 Subject: [PATCH] Re-introduce and deprecate BDPD.initDefaults(Element) For compatibility with Spring Integration's standalone usage of BeanDefinitionParserDelegate. git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3991 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../factory/xml/BeanDefinitionParserDelegate.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java index 8cdd39f1ed0..c515cbae602 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java @@ -325,7 +325,7 @@ public class BeanDefinitionParserDelegate { /** * Initialize the default lazy-init, autowire, dependency check settings, * init-method, destroy-method and merge settings. Support nested 'beans' - * element use cases by falling back to parent in case the + * element use cases by falling back to the given parent in case the * defaults are not explicitly set locally. * @see #populateDefaults(DocumentDefaultsDefinition, DocumentDefaultsDefinition, org.w3c.dom.Element) * @see #getDefaults() @@ -335,6 +335,15 @@ public class BeanDefinitionParserDelegate { this.readerContext.fireDefaultsRegistered(this.defaults); } + /** + * Initialize the default settings assuming a {@code null} parent delegate. + * @deprecated in Spring 3.1 in favor of + * {@link #initDefaults(Element, BeanDefinitionParserDelegate)} + */ + public void initDefaults(Element root) { + initDefaults(root, null); + } + /** * Populate the given DocumentDefaultsDefinition instance with the default lazy-init, * autowire, dependency check settings, init-method, destroy-method and merge settings.