This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[Patch] java.nio.charset merges from classpath
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Mon, 11 Nov 2002 08:14:59 +0100
- Subject: [Patch] java.nio.charset merges from classpath
Hello list,
I've commited the attached classpath merge. Nothing critical only
exceptions and helper classes.
Michael
--
Homepage: http://www.worldforge.org/
GPG-key: http://konqueror.dyndns.org/~mkoch/michael.gpg
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1526
diff -b -u -r1.1526 ChangeLog
--- ChangeLog 11 Nov 2002 07:00:29 -0000 1.1526
+++ ChangeLog 11 Nov 2002 07:11:31 -0000
@@ -1,5 +1,22 @@
2002-11-11 Michael Koch <konqueror@gmx.de>
+ * java/nio/charset/CharacterCodingException.java:
+ This class must be public.
+ * java/nio/charset/CoderMalfunctionError.java:
+ This class must be public.
+ * java/nio/charset/CodingErrorAction.java:
+ This class must be public.
+ * java/nio/charset/IllegalCharsetNameException.java:
+ This class must be public, better implementation.
+ * java/nio/charset/MalformedInputException.java:
+ This class must be public, better implementation.
+ * java/nio/charset/UnmappableCharacterException.java:
+ This class must be public, better implementation.
+ * java/nio/charset/UnsupportedCharsetException.java:
+ This class must be public, better implementation.
+
+2002-11-11 Michael Koch <konqueror@gmx.de>
+
* java/nio/BufferOverflowException.java,
java/nio/BufferUnderflowException.java: New file.
* Makefile.am (ordinary_java_source_files):
Index: java/nio/charset/CharacterCodingException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/charset/CharacterCodingException.java,v
retrieving revision 1.1
diff -b -u -r1.1 CharacterCodingException.java
--- java/nio/charset/CharacterCodingException.java 7 Oct 2002 07:59:12 -0000 1.1
+++ java/nio/charset/CharacterCodingException.java 11 Nov 2002 07:11:31 -0000
@@ -39,7 +39,10 @@
import java.io.IOException;
-class CharacterCodingException extends IOException
+/**
+ * @since 1.4
+ */
+public class CharacterCodingException extends IOException
{
/**
* Creates the exception
Index: java/nio/charset/CoderMalfunctionError.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/charset/CoderMalfunctionError.java,v
retrieving revision 1.1
diff -b -u -r1.1 CoderMalfunctionError.java
--- java/nio/charset/CoderMalfunctionError.java 1 Nov 2002 12:03:39 -0000 1.1
+++ java/nio/charset/CoderMalfunctionError.java 11 Nov 2002 07:11:31 -0000
@@ -40,7 +40,7 @@
/**
* @since 1.4
*/
-class CoderMalfunctionError extends Error
+public class CoderMalfunctionError extends Error
{
/**
* Creates the error
Index: java/nio/charset/CodingErrorAction.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/charset/CodingErrorAction.java,v
retrieving revision 1.1
diff -b -u -r1.1 CodingErrorAction.java
--- java/nio/charset/CodingErrorAction.java 1 Nov 2002 12:03:39 -0000 1.1
+++ java/nio/charset/CodingErrorAction.java 11 Nov 2002 07:11:31 -0000
@@ -37,18 +37,30 @@
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;
}
}
Index: java/nio/charset/IllegalCharsetNameException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/charset/IllegalCharsetNameException.java,v
retrieving revision 1.1
diff -b -u -r1.1 IllegalCharsetNameException.java
--- java/nio/charset/IllegalCharsetNameException.java 7 Oct 2002 07:59:12 -0000 1.1
+++ java/nio/charset/IllegalCharsetNameException.java 11 Nov 2002 07:11:31 -0000
@@ -37,17 +37,17 @@
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 @@
*/
public String getCharsetName ()
{
- return charsetName;
+ return getMessage ();
}
}
Index: java/nio/charset/MalformedInputException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/charset/MalformedInputException.java,v
retrieving revision 1.1
diff -b -u -r1.1 MalformedInputException.java
--- java/nio/charset/MalformedInputException.java 7 Oct 2002 07:59:12 -0000 1.1
+++ java/nio/charset/MalformedInputException.java 11 Nov 2002 07:11:31 -0000
@@ -37,7 +37,10 @@
package java.nio.charset;
-class MalformedInputException extends CharacterCodingException
+/**
+ * @since 1.4
+ */
+public class MalformedInputException extends CharacterCodingException
{
private int inputLength;
@@ -63,7 +66,6 @@
*/
public String getMessage ()
{
- // FIXME: I think this is not correct
- return "";
+ return "Input length = " + inputLength;
}
}
Index: java/nio/charset/UnmappableCharacterException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/charset/UnmappableCharacterException.java,v
retrieving revision 1.1
diff -b -u -r1.1 UnmappableCharacterException.java
--- java/nio/charset/UnmappableCharacterException.java 7 Oct 2002 07:59:12 -0000 1.1
+++ java/nio/charset/UnmappableCharacterException.java 11 Nov 2002 07:11:31 -0000
@@ -37,7 +37,10 @@
package java.nio.charset;
-class UnmappableCharacterException extends CharacterCodingException
+/**
+ * @since 1.4
+ */
+public class UnmappableCharacterException extends CharacterCodingException
{
private int inputLength;
@@ -63,7 +66,6 @@
*/
public String getMessage ()
{
- // FIXME: I think this is not correct
- return "";
+ return "Input length = " + inputLength;
}
}
Index: java/nio/charset/UnsupportedCharsetException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/charset/UnsupportedCharsetException.java,v
retrieving revision 1.1
diff -b -u -r1.1 UnsupportedCharsetException.java
--- java/nio/charset/UnsupportedCharsetException.java 7 Oct 2002 07:59:12 -0000 1.1
+++ java/nio/charset/UnsupportedCharsetException.java 11 Nov 2002 07:11:31 -0000
@@ -37,17 +37,17 @@
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 @@
*/
public String getCharsetName ()
{
- return charsetName;
+ return getMessage ();
}
}