Renamed byte-to-char & char-to-byte converters.

The byte-to-char and char-to-byte converters have been renamed
in preparation for converting them into charset encoders and
decoders.

Ticket #3

8 files changed, 12 insertions, 199 deletions

diff --git a/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java b/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java
index da0fd45c5..4fa7b4ea4 100644
--- a/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java
+++ b/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java
@@ -184,11 +184,11 @@ public class ASN1CharStrConvMap
     static {
 	defaultMap = new ASN1CharStrConvMap();
 	defaultMap.addEntry(DerValue.tag_PrintableString,
-	    	(Class<?>)CharToBytePrintable.class, (Class<?>)ByteToCharPrintable.class);
+		PrintableCharsetEncoder.class, PrintableCharsetDecoder.class);
 	defaultMap.addEntry(DerValue.tag_VisibleString,
-	    	CharToBytePrintable.class, ByteToCharPrintable.class);
+		PrintableCharsetEncoder.class, PrintableCharsetDecoder.class);
 	defaultMap.addEntry(DerValue.tag_IA5String,
-	    	CharToByteIA5String.class, ByteToCharIA5String.class);
+		IA5CharsetEncoder.class, IA5CharsetDecoder.class);
 	defaultMap.addEntry(DerValue.tag_BMPString,
 	        // Changed by bskim
 	    	//sun.io.CharToByteUnicode.class,
@@ -197,8 +197,8 @@ public class ASN1CharStrConvMap
 	    	sun.io.ByteToCharUnicodeBig.class);
 	    	// Change end
 	defaultMap.addEntry(DerValue.tag_UniversalString,
-	    	CharToByteUniversalString.class,
-	    	ByteToCharUniversalString.class);
+		UniversalCharsetEncoder.class,
+		UniversalCharsetDecoder.class);
     	// XXX this is an oversimplified implementation of T.61 strings, it
     	// doesn't handle all cases
 	defaultMap.addEntry(DerValue.tag_T61String,
diff --git a/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java b/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java
deleted file mode 100644
index 312b8a22b..000000000
--- a/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java
+++ /dev/null
@@ -1,187 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package netscape.security.util;
-import sun.io.ByteToCharUnicodeBig;
-import sun.io.ByteToCharUnicodeLittle;
-import sun.io.ConversionBufferFullException;
-import sun.io.MalformedInputException;
-
-/**
- * Convert byte arrays containing Unicode characters into arrays of actual
- * Unicode characters, sensing the byte order automatically.  To force a
- * particular byte order, use either the "UnicodeBig" or the "UnicodeLittle"
- * encoding.
- *
- * If the first character is a byte order mark, it will be interpreted and
- * discarded. Otherwise, the byte order is assumed to be BigEndian.
- * Either way, the byte order is decided by the first character. Later
- * byte order marks will be passed through as characters (if they indicate
- * the same byte order) or will cause an error (if they indicate the other
- * byte order).
- *
- * @see ByteToCharUnicodeLittle
- * @see ByteToCharUnicodeBig
- *
- * @version 	1.3, 96/11/23
- * @author	Mark Reinhold
- */
-
-public class ByteToCharUnicode extends sun.io.ByteToCharConverter {
-
-    static final char BYTE_ORDER_MARK = (char) 0xfeff;
-    static final char REVERSED_MARK = (char) 0xfffe;
-
-    static final int AUTO = 0;
-    static final int BIG = 1;
-    static final int LITTLE = 2;
-
-    int byteOrder;
-
-    public ByteToCharUnicode() {
-	byteOrder = AUTO;
-    }
-
-    public String getCharacterEncoding() {
-	switch (byteOrder) {
-	case BIG:     return "UnicodeBig";
-	case LITTLE:  return "UnicodeLittle";
-	default:      return "Unicode";
-	}
-    }
-
-    boolean started = false;
-    int leftOverByte;
-    boolean leftOver = false;
-
-    public int convert(byte[] in, int inOff, int inEnd,
-		       char[] out, int outOff, int outEnd)
-	throws ConversionBufferFullException, MalformedInputException
-    {
-	byteOff = inOff;
-	charOff = outOff;
-
-	if (inOff >= inEnd)
-	    return 0;
-
-	int b1, b2;
-	int bc = 0;
-	int inI = inOff, outI = outOff;
-
-	if (leftOver) {
-	    b1 = leftOverByte & 0xff;
-	    leftOver = false;
-	}
-	else
-	    b1 = in[inI++] & 0xff;
-	bc = 1;
-
-	if (!started) {		/* Read possible initial byte-order mark */
-	    if (inI < inEnd) {
-		b2 = in[inI++] & 0xff;
-		bc = 2;
-
-		char c = (char) ((b1 << 8) | b2);
-		int bo = AUTO;
-
-		if (c == BYTE_ORDER_MARK)
-		    bo = BIG;
-		else if (c == REVERSED_MARK)
-		    bo = LITTLE;
-
-		if (byteOrder == AUTO) {
-		    if (bo == AUTO) {
-                        bo = BIG; // BigEndian by default
-		    }
-		    byteOrder = bo;
-		    if (inI < inEnd) {
-			b1 = in[inI++] & 0xff;
-			bc = 1;
-		    }
-		}
-		else if (bo == AUTO) {
-		    inI--;
-		    bc = 1;
-		}
-		else if (byteOrder == bo) {
-		    if (inI < inEnd) {
-			b1 = in[inI++] & 0xff;
-			bc = 1;
-		    }
-		}
-		else {
-		    badInputLength = bc;
-		    throw new
-			MalformedInputException("Incorrect byte-order mark");
-		}
-
-		started = true;
-	    }
-	}
-
-	/* Loop invariant: (b1 contains the next input byte) && (bc == 1) */
-	while (inI < inEnd) {
-	    b2 = in[inI++] & 0xff;
-	    bc = 2;
-
-	    char c;
-	    if (byteOrder == BIG)
-		c = (char) ((b1 << 8) | b2);
-	    else
-		c = (char) ((b2 << 8) | b1);
-
-	    if (c == REVERSED_MARK)
-		throw new
-		    MalformedInputException("Reversed byte-order mark");
-
-	    if (outI >= outEnd)
-		throw new ConversionBufferFullException();
-	    out[outI++] = c;
-	    byteOff = inI;
-	    charOff = outI;
-
-	    if (inI < inEnd) {
-		b1 = in[inI++] & 0xff;
-		bc = 1;
-	    }
-	}
-
-	if (bc == 1) {
-	    leftOverByte = b1;
-	    leftOver = true;
-	}
-
-	return outI - outOff;
-    }
-
-    public void reset() {
-	leftOver = false;
-	byteOff = charOff = 0;
-    }
-
-    public int flush(char buf[], int off, int len)
-	throws MalformedInputException
-    {
-	if (leftOver) {
-	    reset();
-	    throw new MalformedInputException();
-	}
-	byteOff = charOff = 0;
-	return 0;
-    }
-
-}
diff --git a/pki/base/util/src/netscape/security/util/ByteToCharIA5String.java b/pki/base/util/src/netscape/security/util/IA5CharsetDecoder.java
index 69fab22a7..d884b9e8c 100644
--- a/pki/base/util/src/netscape/security/util/ByteToCharIA5String.java
+++ b/pki/base/util/src/netscape/security/util/IA5CharsetDecoder.java
@@ -29,7 +29,7 @@ import sun.io.UnknownCharacterException;
  * @author Slava Galperin
  */
 
-public class ByteToCharIA5String extends ByteToCharConverter 
+public class IA5CharsetDecoder extends ByteToCharConverter
 {
     public String getCharacterEncoding() {
 	return "ASN.1 IA5String";
diff --git a/pki/base/util/src/netscape/security/util/CharToByteIA5String.java b/pki/base/util/src/netscape/security/util/IA5CharsetEncoder.java
index f7c0d1e2d..3901ec4ec 100644
--- a/pki/base/util/src/netscape/security/util/CharToByteIA5String.java
+++ b/pki/base/util/src/netscape/security/util/IA5CharsetEncoder.java
@@ -28,7 +28,7 @@ import sun.io.UnknownCharacterException;
  * @author Slava Galperin
  */
 
-public class CharToByteIA5String extends CharToByteConverter 
+public class IA5CharsetEncoder extends CharToByteConverter
 {
     /* 
      * Returns the character set id for the conversion.
diff --git a/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java b/pki/base/util/src/netscape/security/util/PrintableCharsetDecoder.java
index 0607ad2e8..7ffd9cdc6 100644
--- a/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java
+++ b/pki/base/util/src/netscape/security/util/PrintableCharsetDecoder.java
@@ -30,7 +30,7 @@ import sun.io.UnknownCharacterException;
  * @author Slava Galperin
  */
 
-public class ByteToCharPrintable extends ByteToCharConverter
+public class PrintableCharsetDecoder extends ByteToCharConverter
 {
 
     public String getCharacterEncoding()
@@ -54,7 +54,7 @@ public class ByteToCharPrintable extends ByteToCharConverter
 		throw new ConversionBufferFullException();
 	    }
 	    if (!subMode &&
-			!CharToBytePrintable.isPrintableChar((char) (input[i] & 0x7f))) {
+			!PrintableCharsetEncoder.isPrintableChar((char) (input[i] & 0x7f))) {
 			/* "bug" fix for 359010
 			  byteOff = i;
 			  charOff = j;
diff --git a/pki/base/util/src/netscape/security/util/CharToBytePrintable.java b/pki/base/util/src/netscape/security/util/PrintableCharsetEncoder.java
index 970f7782f..351e0668e 100644
--- a/pki/base/util/src/netscape/security/util/CharToBytePrintable.java
+++ b/pki/base/util/src/netscape/security/util/PrintableCharsetEncoder.java
@@ -30,7 +30,7 @@ import sun.io.UnknownCharacterException;
  * @author Slava Galperin
  */
 
-public class CharToBytePrintable extends CharToByteConverter
+public class PrintableCharsetEncoder extends CharToByteConverter
 {
     /*
      * returns the character set id for the conversion.
diff --git a/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java b/pki/base/util/src/netscape/security/util/UniversalCharsetDecoder.java
index 77165b7fe..6a997af99 100644
--- a/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java
+++ b/pki/base/util/src/netscape/security/util/UniversalCharsetDecoder.java
@@ -29,7 +29,7 @@ import sun.io.UnknownCharacterException;
  * @author Slava Galperin
  */
 
-public class ByteToCharUniversalString extends ByteToCharConverter
+public class UniversalCharsetDecoder extends ByteToCharConverter
 {
     public String getCharacterEncoding() {
 	return "ASN.1 UniversalString";
diff --git a/pki/base/util/src/netscape/security/util/CharToByteUniversalString.java b/pki/base/util/src/netscape/security/util/UniversalCharsetEncoder.java
index 0d566d539..89c2a98b9 100644
--- a/pki/base/util/src/netscape/security/util/CharToByteUniversalString.java
+++ b/pki/base/util/src/netscape/security/util/UniversalCharsetEncoder.java
@@ -28,7 +28,7 @@ import sun.io.UnknownCharacterException;
  * @author Slava Galperin
  */
 
-public class CharToByteUniversalString extends CharToByteConverter
+public class UniversalCharsetEncoder extends CharToByteConverter
 {
     /*
      * Returns the character set id for the conversion.