Skip to content

Commit cada569

Browse files
garydgregorygarydgregory
committed
[CODEC-244] Update from Java 6 to Java 7. Update JRE Javadoc links.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1814525 13f79535-47bb-0310-9956-ffa450edef68
1 parent bc33e59 commit cada569

5 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎src/main/java/org/apache/commons/codec/CharEncoding.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Character encoding names required of every implementation of the Java platform.
2222
*
2323
* From the Java documentation <a
24-
* href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>:
24+
* href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>:
2525
* <p>
2626
* <cite>Every implementation of the Java platform is required to support the following character encodings. Consult the
2727
* release documentation for your implementation to see if any other encodings are supported. Consult the release
@@ -51,7 +51,7 @@
5151
* This class is immutable and thread-safe.
5252
* </p>
5353
*
54-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
54+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
5555
* @since 1.4
5656
* @version $Id$
5757
*/
@@ -61,7 +61,7 @@ public class CharEncoding {
6161
* <p>
6262
* Every implementation of the Java platform is required to support this character encoding.
6363
*
64-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
64+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
6565
*/
6666
public static final String ISO_8859_1 = "ISO-8859-1";
6767

@@ -70,7 +70,7 @@ public class CharEncoding {
7070
* <p>
7171
* Every implementation of the Java platform is required to support this character encoding.
7272
*
73-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
73+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
7474
*/
7575
public static final String US_ASCII = "US-ASCII";
7676

@@ -80,7 +80,7 @@ public class CharEncoding {
8080
* <p>
8181
* Every implementation of the Java platform is required to support this character encoding.
8282
*
83-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
83+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
8484
*/
8585
public static final String UTF_16 = "UTF-16";
8686

@@ -89,7 +89,7 @@ public class CharEncoding {
8989
* <p>
9090
* Every implementation of the Java platform is required to support this character encoding.
9191
*
92-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
92+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
9393
*/
9494
public static final String UTF_16BE = "UTF-16BE";
9595

@@ -98,7 +98,7 @@ public class CharEncoding {
9898
* <p>
9999
* Every implementation of the Java platform is required to support this character encoding.
100100
*
101-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
101+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
102102
*/
103103
public static final String UTF_16LE = "UTF-16LE";
104104

@@ -107,7 +107,7 @@ public class CharEncoding {
107107
* <p>
108108
* Every implementation of the Java platform is required to support this character encoding.
109109
*
110-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
110+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
111111
*/
112112
public static final String UTF_8 = "UTF-8";
113113
}

‎src/main/java/org/apache/commons/codec/binary/StringUtils.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626

2727
/**
2828
* Converts String to and from bytes using the encodings required by the Java specification. These encodings are
29-
* specified in <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">
29+
* specified in <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">
3030
* Standard charsets</a>.
3131
*
3232
* <p>This class is immutable and thread-safe.</p>
3333
*
3434
* @see CharEncoding
35-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
35+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
3636
* @version $Id$
3737
* @since 1.4
3838
*/
@@ -123,7 +123,7 @@ private static ByteBuffer getByteBuffer(final String string, final Charset chars
123123
* @throws NullPointerException
124124
* Thrown if {@link Charsets#UTF_8} is not initialized, which should never happen since it is
125125
* required by the Java platform specification.
126-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
126+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
127127
* @see #getBytesUnchecked(String, String)
128128
* @since 1.11
129129
*/
@@ -142,7 +142,7 @@ public static ByteBuffer getByteBufferUtf8(final String string) {
142142
* Thrown if {@link Charsets#ISO_8859_1} is not initialized, which should never happen since it is
143143
* required by the Java platform specification.
144144
* @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
145-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
145+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
146146
* @see #getBytesUnchecked(String, String)
147147
*/
148148
public static byte[] getBytesIso8859_1(final String string) {
@@ -191,7 +191,7 @@ public static byte[] getBytesUnchecked(final String string, final String charset
191191
* Thrown if {@link Charsets#US_ASCII} is not initialized, which should never happen since it is
192192
* required by the Java platform specification.
193193
* @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
194-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
194+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
195195
* @see #getBytesUnchecked(String, String)
196196
*/
197197
public static byte[] getBytesUsAscii(final String string) {
@@ -209,7 +209,7 @@ public static byte[] getBytesUsAscii(final String string) {
209209
* Thrown if {@link Charsets#UTF_16} is not initialized, which should never happen since it is
210210
* required by the Java platform specification.
211211
* @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
212-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
212+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
213213
* @see #getBytesUnchecked(String, String)
214214
*/
215215
public static byte[] getBytesUtf16(final String string) {
@@ -227,7 +227,7 @@ public static byte[] getBytesUtf16(final String string) {
227227
* Thrown if {@link Charsets#UTF_16BE} is not initialized, which should never happen since it is
228228
* required by the Java platform specification.
229229
* @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
230-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
230+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
231231
* @see #getBytesUnchecked(String, String)
232232
*/
233233
public static byte[] getBytesUtf16Be(final String string) {
@@ -245,7 +245,7 @@ public static byte[] getBytesUtf16Be(final String string) {
245245
* Thrown if {@link Charsets#UTF_16LE} is not initialized, which should never happen since it is
246246
* required by the Java platform specification.
247247
* @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
248-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
248+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
249249
* @see #getBytesUnchecked(String, String)
250250
*/
251251
public static byte[] getBytesUtf16Le(final String string) {
@@ -263,7 +263,7 @@ public static byte[] getBytesUtf16Le(final String string) {
263263
* Thrown if {@link Charsets#UTF_8} is not initialized, which should never happen since it is
264264
* required by the Java platform specification.
265265
* @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
266-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
266+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
267267
* @see #getBytesUnchecked(String, String)
268268
*/
269269
public static byte[] getBytesUtf8(final String string) {

‎src/main/java/org/apache/commons/codec/net/BCodec.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public BCodec() {
6262
* @param charset
6363
* the default string Charset to use.
6464
*
65-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
65+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
6666
* @since 1.7
6767
*/
6868
public BCodec(final Charset charset) {
@@ -77,7 +77,7 @@ public BCodec(final Charset charset) {
7777
* @throws java.nio.charset.UnsupportedCharsetException
7878
* If the named Charset is unavailable
7979
* @since 1.7 throws UnsupportedCharsetException if the named Charset is unavailable
80-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
80+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
8181
*/
8282
public BCodec(final String charsetName) {
8383
this(Charset.forName(charsetName));

‎src/main/java/org/apache/commons/codec/net/QCodec.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public QCodec() {
122122
* @param charset
123123
* the default string Charset to use.
124124
*
125-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
125+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
126126
* @since 1.7
127127
*/
128128
public QCodec(final Charset charset) {
@@ -138,7 +138,7 @@ public QCodec(final Charset charset) {
138138
* @throws java.nio.charset.UnsupportedCharsetException
139139
* If the named Charset is unavailable
140140
* @since 1.7 throws UnsupportedCharsetException if the named Charset is unavailable
141-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
141+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
142142
*/
143143
public QCodec(final String charsetName) {
144144
this(Charset.forName(charsetName));

‎src/main/java/org/apache/commons/codec/net/RFC1522Codec.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ abstract class RFC1522Codec {
6363
* @return RFC 1522 compliant "encoded-word"
6464
* @throws EncoderException
6565
* thrown if there is an error condition during the Encoding process.
66-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
66+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
6767
*/
6868
protected String encodeText(final String text, final Charset charset) throws EncoderException {
6969
if (text == null) {
@@ -97,7 +97,7 @@ protected String encodeText(final String text, final Charset charset) throws Enc
9797
* @throws UnsupportedEncodingException
9898
* if charset is not available
9999
*
100-
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
100+
* @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
101101
*/
102102
protected String encodeText(final String text, final String charsetName)
103103
throws EncoderException, UnsupportedEncodingException {

0 commit comments

Comments
 (0)