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

[Kaffe CVS]

PatchSet 6487 
Date: 2005/05/15 11:48:51
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: nio fix

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

        Resynced with GNU Classpath.

        2005-04-28  Michael Koch  <konqueror at gmx.de>

        * java/nio/charset/Charset.java
        (providers2): Renamed from 'providers'.

Members: 
	ChangeLog:1.4013->1.4014 
	libraries/javalib/java/nio/charset/Charset.java:1.11->1.12 
	libraries/javalib/java/security/Security.java:1.19->1.20 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4013 kaffe/ChangeLog:1.4014
--- kaffe/ChangeLog:1.4013	Sun May 15 11:44:03 2005
+++ kaffe/ChangeLog	Sun May 15 11:48:51 2005
@@ -4,6 +4,15 @@
 
 	2005-04-28  Michael Koch  <konqueror at gmx.de>
 
+        * java/nio/charset/Charset.java
+        (providers2): Renamed from 'providers'.
+
+2005-05-15  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
+	2005-04-28  Michael Koch  <konqueror at gmx.de>
+
         * java/security/AccessControlContext.java:
         Reformatted.
 
Index: kaffe/libraries/javalib/java/nio/charset/Charset.java
diff -u kaffe/libraries/javalib/java/nio/charset/Charset.java:1.11 kaffe/libraries/javalib/java/nio/charset/Charset.java:1.12
--- kaffe/libraries/javalib/java/nio/charset/Charset.java:1.11	Sat Apr 23 11:53:13 2005
+++ kaffe/libraries/javalib/java/nio/charset/Charset.java	Sun May 15 11:48:52 2005
@@ -185,7 +185,7 @@
   {
     checkName (charsetName);
     Charset cs = null;
-    CharsetProvider[] providers = providers();
+    CharsetProvider[] providers = providers2();
     for (int i = 0; i < providers.length; i++)
       {
         cs = providers[i].charsetForName(charsetName);
@@ -199,7 +199,7 @@
   {
     TreeMap charsets = new TreeMap(String.CASE_INSENSITIVE_ORDER);
 
-    CharsetProvider[] providers = providers();
+    CharsetProvider[] providers = providers2();
     for (int j = 0; j < providers.length; j++)
       {
         for (Iterator i = providers[j].charsets(); i.hasNext(); )
@@ -222,7 +222,7 @@
    * java.nio.charset.spi.CharsetProvider in the resource directory
    * META-INF/services.
    */
-  private static CharsetProvider[] providers()
+  private static CharsetProvider[] providers2()
   {
     if (providers == null)
       {
Index: kaffe/libraries/javalib/java/security/Security.java
diff -u kaffe/libraries/javalib/java/security/Security.java:1.19 kaffe/libraries/javalib/java/security/Security.java:1.20
--- kaffe/libraries/javalib/java/security/Security.java:1.19	Sun May 15 11:44:06 2005
+++ kaffe/libraries/javalib/java/security/Security.java	Sun May 15 11:48:53 2005
@@ -40,6 +40,8 @@
 
 import gnu.classpath.SystemProperties;
 
+import gnu.classpath.Configuration;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;