diff options
Diffstat (limited to 'libjava/java/nio/charset')
7 files changed, 46 insertions, 27 deletions
diff --git a/libjava/java/nio/charset/CharacterCodingException.java b/libjava/java/nio/charset/CharacterCodingException.java index 2fba33e9509..f6a283bdaff 100644 --- a/libjava/java/nio/charset/CharacterCodingException.java +++ b/libjava/java/nio/charset/CharacterCodingException.java @@ -39,7 +39,10 @@ package java.nio.charset; import java.io.IOException; -class CharacterCodingException extends IOException +/** + * @since 1.4 + */ +public class CharacterCodingException extends IOException { /** * Creates the exception diff --git a/libjava/java/nio/charset/CoderMalfunctionError.java b/libjava/java/nio/charset/CoderMalfunctionError.java index 16c23bfa224..df57b820a21 100644 --- a/libjava/java/nio/charset/CoderMalfunctionError.java +++ b/libjava/java/nio/charset/CoderMalfunctionError.java @@ -40,7 +40,7 @@ package java.nio.charset; /** * @since 1.4 */ -class CoderMalfunctionError extends Error +public class CoderMalfunctionError extends Error { /** * Creates the error diff --git a/libjava/java/nio/charset/CodingErrorAction.java b/libjava/java/nio/charset/CodingErrorAction.java index 463107712f6..1a2e317c7c2 100644 --- a/libjava/java/nio/charset/CodingErrorAction.java +++ b/libjava/java/nio/charset/CodingErrorAction.java @@ -37,18 +37,30 @@ exception statement from your version. */ package java.nio.charset; - -class CodingErrorAction +public class CodingErrorAction { - public static final CodingErrorAction IGNORE; - public static final CodingErrorAction REPLACE; - public static final CodingErrorAction REPORT; + public static final CodingErrorAction IGNORE + = new CodingErrorAction("ignore"); + public static final CodingErrorAction REPLACE + = new CodingErrorAction("replace"); + public static final CodingErrorAction REPORT + = new CodingErrorAction("report"); + + private final String name; + + /** + * Private constructor only used to create the constant CodingErrorActions. + */ + private CodingErrorAction(String name) + { + this.name = name; + } /** - * FIXME + * Returns the name of the CodingErrorAction. */ public String toString () { - return ""; + return name; } } diff --git a/libjava/java/nio/charset/IllegalCharsetNameException.java b/libjava/java/nio/charset/IllegalCharsetNameException.java index a3e0593327b..762eb687fbf 100644 --- a/libjava/java/nio/charset/IllegalCharsetNameException.java +++ b/libjava/java/nio/charset/IllegalCharsetNameException.java @@ -37,17 +37,17 @@ exception statement from your version. */ package java.nio.charset; -class IllegalCharsetNameException extends IllegalArgumentException +/** + * @since 1.4 + */ +public class IllegalCharsetNameException extends IllegalArgumentException { - private String charsetName; - /** * Creates the exception */ public IllegalCharsetNameException (String charsetName) { - super (); - this.charsetName = charsetName; + super (charsetName); } /** @@ -55,6 +55,6 @@ class IllegalCharsetNameException extends IllegalArgumentException */ public String getCharsetName () { - return charsetName; + return getMessage (); } } diff --git a/libjava/java/nio/charset/MalformedInputException.java b/libjava/java/nio/charset/MalformedInputException.java index 2111b797865..692eed60f94 100644 --- a/libjava/java/nio/charset/MalformedInputException.java +++ b/libjava/java/nio/charset/MalformedInputException.java @@ -37,7 +37,10 @@ exception statement from your version. */ package java.nio.charset; -class MalformedInputException extends CharacterCodingException +/** + * @since 1.4 + */ +public class MalformedInputException extends CharacterCodingException { private int inputLength; @@ -63,7 +66,6 @@ class MalformedInputException extends CharacterCodingException */ public String getMessage () { - // FIXME: I think this is not correct - return ""; + return "Input length = " + inputLength; } } diff --git a/libjava/java/nio/charset/UnmappableCharacterException.java b/libjava/java/nio/charset/UnmappableCharacterException.java index f1714b8ec41..5ae49302d06 100644 --- a/libjava/java/nio/charset/UnmappableCharacterException.java +++ b/libjava/java/nio/charset/UnmappableCharacterException.java @@ -37,7 +37,10 @@ exception statement from your version. */ package java.nio.charset; -class UnmappableCharacterException extends CharacterCodingException +/** + * @since 1.4 + */ +public class UnmappableCharacterException extends CharacterCodingException { private int inputLength; @@ -63,7 +66,6 @@ class UnmappableCharacterException extends CharacterCodingException */ public String getMessage () { - // FIXME: I think this is not correct - return ""; + return "Input length = " + inputLength; } } diff --git a/libjava/java/nio/charset/UnsupportedCharsetException.java b/libjava/java/nio/charset/UnsupportedCharsetException.java index 943164a6837..13aaa520524 100644 --- a/libjava/java/nio/charset/UnsupportedCharsetException.java +++ b/libjava/java/nio/charset/UnsupportedCharsetException.java @@ -37,17 +37,17 @@ exception statement from your version. */ package java.nio.charset; -class UnsupportedCharsetException extends IllegalArgumentException +/** + * @since 1.4 + */ +public class UnsupportedCharsetException extends IllegalArgumentException { - private String charsetName; - /** * Creates the exception */ public UnsupportedCharsetException (String charsetName) { - super (); - this.charsetName = charsetName; + super (charsetName); } /** @@ -55,6 +55,6 @@ class UnsupportedCharsetException extends IllegalArgumentException */ public String getCharsetName () { - return charsetName; + return getMessage (); } } |
