You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2015/12/01 09:21:10 UTC

svn commit: r1717387 - /httpcomponents/httpcore/branches/4.4.x/httpcore/src/main/java/org/apache/http/Consts.java

Author: olegk
Date: Tue Dec  1 08:21:10 2015
New Revision: 1717387

URL: http://svn.apache.org/viewvc?rev=1717387&view=rev
Log:
Revert "Javadoc as deprecated constants that now use Java 7's StandardCharsets in version 5.0."

Modified:
    httpcomponents/httpcore/branches/4.4.x/httpcore/src/main/java/org/apache/http/Consts.java

Modified: httpcomponents/httpcore/branches/4.4.x/httpcore/src/main/java/org/apache/http/Consts.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.4.x/httpcore/src/main/java/org/apache/http/Consts.java?rev=1717387&r1=1717386&r2=1717387&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.4.x/httpcore/src/main/java/org/apache/http/Consts.java (original)
+++ httpcomponents/httpcore/branches/4.4.x/httpcore/src/main/java/org/apache/http/Consts.java Tue Dec  1 08:21:10 2015
@@ -28,7 +28,6 @@
 package org.apache.http;
 
 import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 
 /**
  * Commons constants.
@@ -40,24 +39,10 @@ public final class Consts {
     public static final int CR = 13; // <US-ASCII CR, carriage return (13)>
     public static final int LF = 10; // <US-ASCII LF, linefeed (10)>
     public static final int SP = 32; // <US-ASCII SP, space (32)>
-    public static final int HT = 9; // <US-ASCII HT, horizontal-tab (9)>
+    public static final int HT = 9;  // <US-ASCII HT, horizontal-tab (9)>
 
-    /**
-     * @deprecated Removed in version 5.0, use {@link StandardCharsets#UTF_8} instead.
-     */
-    @Deprecated
     public static final Charset UTF_8 = Charset.forName("UTF-8");
-
-    /**
-     * @deprecated Removed in version 5.0, use {@link StandardCharsets#US_ASCII} instead.
-     */
-    @Deprecated
     public static final Charset ASCII = Charset.forName("US-ASCII");
-
-    /**
-     * @deprecated Removed in version 5.0, use {@link StandardCharsets#ISO_8859_1} instead.
-     */
-    @Deprecated
     public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
 
     private Consts() {