You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2014/01/30 17:28:30 UTC
svn commit: r1562881 - in /commons/proper/io/trunk/src: changes/changes.xml
main/java/org/apache/commons/io/Charsets.java
Author: ggregory
Date: Thu Jan 30 16:28:29 2014
New Revision: 1562881
URL: http://svn.apache.org/r1562881
Log:
[IO-422] Deprecate Charsets Charset constants in favor of Java 7's java.nio.charset.StandardCharsets.
Modified:
commons/proper/io/trunk/src/changes/changes.xml
commons/proper/io/trunk/src/main/java/org/apache/commons/io/Charsets.java
Modified: commons/proper/io/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/changes/changes.xml?rev=1562881&r1=1562880&r2=1562881&view=diff
==============================================================================
--- commons/proper/io/trunk/src/changes/changes.xml (original)
+++ commons/proper/io/trunk/src/changes/changes.xml Thu Jan 30 16:28:29 2014
@@ -46,7 +46,10 @@ The <action> type attribute can be add,u
<body>
<!-- The release date is the date RC is cut -->
- <release version="2.5" date="2014-??-??" description="New features and bug fixes.">
+ <release version="2.5" date="2014-??-??" description="New features and bug fixes.">
+ <action issue="IO-422" dev="ggregory" type="update">
+ Deprecate Charsets Charset constants in favor of Java 7's java.nio.charset.StandardCharsets
+ </action>
<action issue="IO-410" dev="sebb" type="add" due-to="BELUGA BEHR">
Readfully() That Returns A Byte Array
</action>
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/Charsets.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/Charsets.java?rev=1562881&r1=1562880&r2=1562881&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/Charsets.java (original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/Charsets.java Thu Jan 30 16:28:29 2014
@@ -73,6 +73,7 @@ public class Charsets {
*/
public static SortedMap<String, Charset> requiredCharsets() {
// maybe cache?
+ // TODO Re-implement on Java 7 to use java.nio.charset.StandardCharsets
final TreeMap<String, Charset> m = new TreeMap<String, Charset>(String.CASE_INSENSITIVE_ORDER);
m.put(ISO_8859_1.name(), ISO_8859_1);
m.put(US_ASCII.name(), US_ASCII);
@@ -114,7 +115,9 @@ public class Charsets {
* </p>
*
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets}
*/
+ @Deprecated
public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
/**
@@ -126,7 +129,9 @@ public class Charsets {
* </p>
*
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets}
*/
+ @Deprecated
public static final Charset US_ASCII = Charset.forName("US-ASCII");
/**
@@ -139,7 +144,9 @@ public class Charsets {
* </p>
*
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets}
*/
+ @Deprecated
public static final Charset UTF_16 = Charset.forName("UTF-16");
/**
@@ -151,7 +158,9 @@ public class Charsets {
* </p>
*
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets}
*/
+ @Deprecated
public static final Charset UTF_16BE = Charset.forName("UTF-16BE");
/**
@@ -163,7 +172,9 @@ public class Charsets {
* </p>
*
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets}
*/
+ @Deprecated
public static final Charset UTF_16LE = Charset.forName("UTF-16LE");
/**
@@ -175,6 +186,8 @@ public class Charsets {
* </p>
*
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets}
*/
+ @Deprecated
public static final Charset UTF_8 = Charset.forName("UTF-8");
}