ggregory 2004/07/26 15:55:40
Modified: codec/src/java/org/apache/commons/codec/net URLCodec.java
QCodec.java RFC1522Codec.java BCodec.java
QuotedPrintableCodec.java
Added: codec/src/java/org/apache/commons/codec/net
CharacterEncodingNames.java
Removed: codec/src/java/org/apache/commons/codec/net
StringEncodings.java
Log:
Renamed the package private interface StringEncodings to CharacterEncodingNames and
added more Javadocs.
Revision Changes Path
1.20 +4 -4
jakarta-commons/codec/src/java/org/apache/commons/codec/net/URLCodec.java
Index: URLCodec.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/codec/src/java/org/apache/commons/codec/net/URLCodec.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- URLCodec.java 29 Mar 2004 07:59:00 -0000 1.19
+++ URLCodec.java 26 Jul 2004 22:55:39 -0000 1.20
@@ -52,7 +52,7 @@
/**
* The default charset used for string decoding and encoding.
*/
- protected String charset = StringEncodings.UTF8;
+ protected String charset = CharacterEncodingNames.UTF8;
protected static byte ESCAPE_CHAR = '%';
/**
@@ -223,7 +223,7 @@
if (pString == null) {
return null;
}
- return new String(encode(pString.getBytes(charset)),
StringEncodings.US_ASCII);
+ return new String(encode(pString.getBytes(charset)),
CharacterEncodingNames.US_ASCII);
}
@@ -267,7 +267,7 @@
if (pString == null) {
return null;
}
- return new String(decode(pString.getBytes(StringEncodings.US_ASCII)),
charset);
+ return new
String(decode(pString.getBytes(CharacterEncodingNames.US_ASCII)), charset);
}
1.7 +2 -2
jakarta-commons/codec/src/java/org/apache/commons/codec/net/QCodec.java
Index: QCodec.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/codec/src/java/org/apache/commons/codec/net/QCodec.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- QCodec.java 24 May 2004 00:24:32 -0000 1.6
+++ QCodec.java 26 Jul 2004 22:55:40 -0000 1.7
@@ -48,7 +48,7 @@
/**
* The default charset used for string decoding and encoding.
*/
- private String charset = StringEncodings.UTF8;
+ private String charset = CharacterEncodingNames.UTF8;
/**
* BitSet of printable characters as defined in RFC 1522.
1.3 +3 -3
jakarta-commons/codec/src/java/org/apache/commons/codec/net/RFC1522Codec.java
Index: RFC1522Codec.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/codec/src/java/org/apache/commons/codec/net/RFC1522Codec.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RFC1522Codec.java 9 Apr 2004 22:21:43 -0000 1.2
+++ RFC1522Codec.java 26 Jul 2004 22:55:40 -0000 1.3
@@ -75,7 +75,7 @@
buffer.append(getEncoding());
buffer.append('?');
byte [] rawdata = doEncoding(text.getBytes(charset));
- buffer.append(new String(rawdata, StringEncodings.US_ASCII));
+ buffer.append(new String(rawdata, CharacterEncodingNames.US_ASCII));
buffer.append("?=");
return buffer.toString();
}
@@ -123,7 +123,7 @@
}
from = to + 1;
to = text.indexOf("?", from);
- byte[] data = text.substring(from, to).getBytes(StringEncodings.US_ASCII);
+ byte[] data = text.substring(from,
to).getBytes(CharacterEncodingNames.US_ASCII);
data = doDecoding(data);
return new String(data, charset);
}
1.6 +2 -2
jakarta-commons/codec/src/java/org/apache/commons/codec/net/BCodec.java
Index: BCodec.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/codec/src/java/org/apache/commons/codec/net/BCodec.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BCodec.java 13 Apr 2004 22:46:37 -0000 1.5
+++ BCodec.java 26 Jul 2004 22:55:40 -0000 1.6
@@ -46,7 +46,7 @@
/**
* The default charset used for string decoding and encoding.
*/
- private String charset = StringEncodings.UTF8;
+ private String charset = CharacterEncodingNames.UTF8;
/**
* Default constructor.
1.8 +4 -4
jakarta-commons/codec/src/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
Index: QuotedPrintableCodec.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/codec/src/java/org/apache/commons/codec/net/QuotedPrintableCodec.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- QuotedPrintableCodec.java 9 Apr 2004 22:21:07 -0000 1.7
+++ QuotedPrintableCodec.java 26 Jul 2004 22:55:40 -0000 1.8
@@ -60,7 +60,7 @@
/**
* The default charset used for string decoding and encoding.
*/
- private String charset = StringEncodings.UTF8;
+ private String charset = CharacterEncodingNames.UTF8;
/**
* BitSet of printable characters as defined in RFC 1521.
@@ -276,7 +276,7 @@
if (pString == null) {
return null;
}
- return new String(decode(pString.getBytes(StringEncodings.US_ASCII)),
charset);
+ return new
String(decode(pString.getBytes(CharacterEncodingNames.US_ASCII)), charset);
}
/**
@@ -382,6 +382,6 @@
if (pString == null) {
return null;
}
- return new String(encode(pString.getBytes(charset)),
StringEncodings.US_ASCII);
+ return new String(encode(pString.getBytes(charset)),
CharacterEncodingNames.US_ASCII);
}
}
1.1
jakarta-commons/codec/src/java/org/apache/commons/codec/net/CharacterEncodingNames.java
Index: CharacterEncodingNames.java
===================================================================
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.commons.codec.net;
/**
* Character encoding names required of every implementation of the Java platform.
*
* According to the Java documentation <a
*
href="http://java.sun.com/j2se/1.3/docs/api/java/lang/package-summary.html#charenc";>JRE
character encoding names
* </a>:
* <p>
* <cite>Every implementation of the Java platform is required to support the
following character encodings. Consult the
* release documentation for your implementation to see if any other encodings are
supported. </cite>
* </p>
*
* This interface is private to the package since it perhaps would best belong in
the [lang] project with other required
* encoding names. As is, this interface only defines the names used in this
package. Even if a similar interface is
* defined in [lang], it is not forseen that [codec] would be made to depend on
[lang].
*
* @see <a
href="http://java.sun.com/j2se/1.3/docs/api/java/lang/package-summary.html#charenc";>JRE
character encoding
* names </a>
* @author Apache Software Foundation
* @since 1.4
* @version $Id: CharacterEncodingNames.java,v 1.1 2004/07/26 22:55:40 ggregory Exp $
*/
interface CharacterEncodingNames {
/**
* <p>
* Seven-bit ASCII, also known as ISO646-US, also known as the Basic Latin block
of the Unicode character set.
* </p>
* <p>
* Every implementation of the Java platform is required to support this
character encoding.
* </p>
*
* @see <a
href="http://java.sun.com/j2se/1.3/docs/api/java/lang/package-summary.html#charenc";>JRE
character
* encoding names </a>
*/
String US_ASCII = "US-ASCII";
/**
* <p>
* Eight-bit Unicode Transformation Format.
* </p>
* <p>
* Every implementation of the Java platform is required to support this
character encoding.
* </p>
*
* @see <a
href="http://java.sun.com/j2se/1.3/docs/api/java/lang/package-summary.html#charenc";>JRE
character
* encoding names </a>
*/
String UTF8 = "UTF-8";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
