From cf2563bdf575cd61f477a5274a8fb83f8bcc4c5c Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 1 Jun 2011 21:05:23 +0000 Subject: [PATCH] [SPR-8388] Cleared up confusing documentation regarding PropertyResolver and Environment. --- .../beans/PropertyEditorRegistrySupport.java | 2 +- .../core/io/support/ResourceArrayPropertyEditor.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java b/org.springframework.beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java index 922187b34ba..2b547c0edf6 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 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. diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java b/org.springframework.core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java index a9b8bf1ad10..d3925dd5b57 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java +++ b/org.springframework.core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java @@ -76,7 +76,7 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport { * Create a new ResourceArrayPropertyEditor with the given {@link ResourcePatternResolver} * and a {@link StandardEnvironment}. * @param resourcePatternResolver the ResourcePatternResolver to use - * @deprecated as of 3.1 in favor of {@link #ResourceArrayPropertyEditor(ResourcePatternResolver, Environment)} + * @deprecated as of 3.1 in favor of {@link #ResourceArrayPropertyEditor(ResourcePatternResolver, PropertyResolver)} */ @Deprecated public ResourceArrayPropertyEditor(ResourcePatternResolver resourcePatternResolver) { @@ -85,7 +85,7 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport { /** * Create a new ResourceArrayPropertyEditor with the given {@link ResourcePatternResolver} - * and {@link Environment}. + * and {@link PropertyResolver} (typically an {@link Environment}). * @param resourcePatternResolver the ResourcePatternResolver to use * @param propertyResolver the PropertyResolver to use */ @@ -99,7 +99,7 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport { * @param resourcePatternResolver the ResourcePatternResolver to use * @param ignoreUnresolvablePlaceholders whether to ignore unresolvable placeholders * if no corresponding system property could be found - * @deprecated as of 3.1 in favor of {@link #ResourceArrayPropertyEditor(ResourcePatternResolver, Environment, boolean)} + * @deprecated as of 3.1 in favor of {@link #ResourceArrayPropertyEditor(ResourcePatternResolver, PropertyResolver, boolean)} */ @Deprecated public ResourceArrayPropertyEditor(ResourcePatternResolver resourcePatternResolver, boolean ignoreUnresolvablePlaceholders) { @@ -108,7 +108,7 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport { /** * Create a new ResourceArrayPropertyEditor with the given {@link ResourcePatternResolver} - * and {@link Environment}. + * and {@link PropertyResolver} (typically an {@link Environment}). * @param resourcePatternResolver the ResourcePatternResolver to use * @param propertyResolver the PropertyResolver to use * @param ignoreUnresolvablePlaceholders whether to ignore unresolvable placeholders @@ -162,7 +162,7 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport { catch (IOException ex) { // ignore - might be an unresolved placeholder or non-existing base directory if (logger.isDebugEnabled()) { - logger.debug("Could not retrieve resources for pattern '" + pattern + "': " + ex); + logger.debug("Could not retrieve resources for pattern '" + pattern + "'", ex); } } }