GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

[SPR-8388] Cleared up confusing documentation regarding PropertyResolver and Environment. 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4403 50f2f4bb-b051-0410-bef5-90022cba6387
pull/1/merge
Sam Brannen 15 years ago
parent
d81b19e958
commit
f70fd0965d
2 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      org.springframework.beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
  2. 10
      org.springframework.core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java

2
org.springframework.beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
Unescape View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

10
org.springframework.core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java
Unescape View File

@ -76,7 +76,7 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport {
* Create a new ResourceArrayPropertyEditor with the given {@link ResourcePatternResolver} * Create a new ResourceArrayPropertyEditor with the given {@link ResourcePatternResolver}
* and a {@link StandardEnvironment}. * and a {@link StandardEnvironment}.
* @param resourcePatternResolver the ResourcePatternResolver to use * @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 @Deprecated
public ResourceArrayPropertyEditor(ResourcePatternResolver resourcePatternResolver) { public ResourceArrayPropertyEditor(ResourcePatternResolver resourcePatternResolver) {
@ -85,7 +85,7 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport {
/** /**
* Create a new ResourceArrayPropertyEditor with the given {@link ResourcePatternResolver} * 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 resourcePatternResolver the ResourcePatternResolver to use
* @param propertyResolver the PropertyResolver to use * @param propertyResolver the PropertyResolver to use
*/ */
@ -99,7 +99,7 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport {
* @param resourcePatternResolver the ResourcePatternResolver to use * @param resourcePatternResolver the ResourcePatternResolver to use
* @param ignoreUnresolvablePlaceholders whether to ignore unresolvable placeholders * @param ignoreUnresolvablePlaceholders whether to ignore unresolvable placeholders
* if no corresponding system property could be found * 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 @Deprecated
public ResourceArrayPropertyEditor(ResourcePatternResolver resourcePatternResolver, boolean ignoreUnresolvablePlaceholders) { public ResourceArrayPropertyEditor(ResourcePatternResolver resourcePatternResolver, boolean ignoreUnresolvablePlaceholders) {
@ -108,7 +108,7 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport {
/** /**
* Create a new ResourceArrayPropertyEditor with the given {@link ResourcePatternResolver} * 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 resourcePatternResolver the ResourcePatternResolver to use
* @param propertyResolver the PropertyResolver to use * @param propertyResolver the PropertyResolver to use
* @param ignoreUnresolvablePlaceholders whether to ignore unresolvable placeholders * @param ignoreUnresolvablePlaceholders whether to ignore unresolvable placeholders
@ -162,7 +162,7 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport {
catch (IOException ex) { catch (IOException ex) {
// ignore - might be an unresolved placeholder or non-existing base directory // ignore - might be an unresolved placeholder or non-existing base directory
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Could not retrieve resources for pattern '" + pattern + "': " + ex); logger.debug("Could not retrieve resources for pattern '" + pattern + "'", ex);
} }
} }
} }

Write Preview
Loading…
Cancel
Save