[kaffe] CVS kaffe (robilad): resynced with gnu classpath: iconv fix

[Kaffe CVS]

PatchSet 6477 
Date: 2005/05/15 09:49:30
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: iconv fix

2005-05-15  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-04-26  Tom Tromey  <tromey at redhat.com>

        * gnu/java/nio/charset/iconv/IconvCharset.java (name):
        Removed unused field.
        (IconvCharset): Updated.

Members: 
	ChangeLog:1.4004->1.4005 
	libraries/javalib/gnu/java/nio/charset/iconv/IconvCharset.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4004 kaffe/ChangeLog:1.4005
--- kaffe/ChangeLog:1.4004	Sun May 15 09:46:06 2005
+++ kaffe/ChangeLog	Sun May 15 09:49:30 2005
@@ -4,6 +4,16 @@
 
 	2005-04-26  Tom Tromey  <tromey at redhat.com>
 
+        * gnu/java/nio/charset/iconv/IconvCharset.java (name):
+        Removed unused field.
+        (IconvCharset): Updated.
+
+2005-05-15  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
+	2005-04-26  Tom Tromey  <tromey at redhat.com>
+
         * javax/swing/text/html/parser/ParserDelegator.java (callBack,
         gnu): Now package-private.
         * javax/swing/text/html/parser/DocumentParser.java (parser,
Index: kaffe/libraries/javalib/gnu/java/nio/charset/iconv/IconvCharset.java
diff -u kaffe/libraries/javalib/gnu/java/nio/charset/iconv/IconvCharset.java:1.1 kaffe/libraries/javalib/gnu/java/nio/charset/iconv/IconvCharset.java:1.2
--- kaffe/libraries/javalib/gnu/java/nio/charset/iconv/IconvCharset.java:1.1	Sat Apr 23 09:54:27 2005
+++ kaffe/libraries/javalib/gnu/java/nio/charset/iconv/IconvCharset.java	Sun May 15 09:49:35 2005
@@ -38,22 +38,17 @@
 
 package gnu.java.nio.charset.iconv;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CoderResult;
 
 public final class IconvCharset extends Charset
 {
-  private String name;
   private IconvMetaData info;
 
   public IconvCharset(IconvMetaData info)
   {
     super(info.nioCanonical(), info.aliases());
-    this.name = name;
     this.info = info;
     if (newEncoder() == null || newDecoder() == null)
       throw new IllegalArgumentException();