root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2016-06-30 14:03:28 +02:00
parent c4c941c43f
commit 232cfe5e98
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2016 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.
@ -29,12 +29,12 @@ import java.util.Properties;
* *
* <p>Allows for reading from any Reader and writing to any Writer, for example * <p>Allows for reading from any Reader and writing to any Writer, for example
* to specify a charset for a properties file. This is a capability that standard * to specify a charset for a properties file. This is a capability that standard
* {@code java.util.Properties} unfortunately lacked up until JDK 1.5: * {@code java.util.Properties} unfortunately lacked up until JDK 5:
* You were only able to load files using the ISO-8859-1 charset there. * You were only able to load files using the ISO-8859-1 charset there.
* *
* <p>Loading from and storing to a stream delegates to {@code Properties.load} * <p>Loading from and storing to a stream delegates to {@code Properties.load}
* and {@code Properties.store}, respectively, to be fully compatible with * and {@code Properties.store}, respectively, to be fully compatible with
* the Unicode conversion as implemented by the JDK Properties class. As of JDK 1.6, * the Unicode conversion as implemented by the JDK Properties class. As of JDK 6,
* {@code Properties.load/store} will also be used for readers/writers, * {@code Properties.load/store} will also be used for readers/writers,
* effectively turning this class into a plain backwards compatibility adapter. * effectively turning this class into a plain backwards compatibility adapter.
* *

8
spring-core/src/main/java/org/springframework/util/PropertiesPersister.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2016 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.
@ -32,10 +32,6 @@ import java.util.Properties;
* but allowing for reading from any Reader and writing to any Writer * but allowing for reading from any Reader and writing to any Writer
* (which allows to specify an encoding for a properties file). * (which allows to specify an encoding for a properties file).
* *
* <p>As of Spring 1.2.2, this interface also supports properties XML files,
* through the {@code loadFromXml} and {@code storeToXml} methods.
* The default implementations delegate to JDK 1.5's corresponding methods.
*
* @author Juergen Hoeller * @author Juergen Hoeller
* @since 10.03.2004 * @since 10.03.2004
* @see DefaultPropertiesPersister * @see DefaultPropertiesPersister
@ -62,7 +58,6 @@ public interface PropertiesPersister {
*/ */
void load(Properties props, Reader reader) throws IOException; void load(Properties props, Reader reader) throws IOException;
/** /**
* Write the contents of the given Properties object to the * Write the contents of the given Properties object to the
* given OutputStream. * given OutputStream.
@ -84,7 +79,6 @@ public interface PropertiesPersister {
*/ */
void store(Properties props, Writer writer, String header) throws IOException; void store(Properties props, Writer writer, String header) throws IOException;
/** /**
* Load properties from the given XML InputStream into the * Load properties from the given XML InputStream into the
* given Properties object. * given Properties object.