[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath

[Kaffe CVS]

PatchSet 4276 
Date: 2004/01/03 04:20:17
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

2004-01-03  Dalibor Topic <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2003-12-26  Michael Koch  <konqueror at gmx.de>

        * java/util/prefs/Preferences.java:
        Import used classes explicitely.
        * java/util/prefs/AbstractPreferences.java
        (cachedChildren): New method.

Members: 
	ChangeLog:1.1863->1.1864 
	libraries/javalib/java/util/prefs/AbstractPreferences.java:1.3->1.4 
	libraries/javalib/java/util/prefs/Preferences.java:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1863 kaffe/ChangeLog:1.1864
--- kaffe/ChangeLog:1.1863	Sat Jan  3 04:14:32 2004
+++ kaffe/ChangeLog	Sat Jan  3 04:20:17 2004
@@ -2,6 +2,17 @@
 
 	Resynced with GNU Classpath.
 
+	2003-12-26  Michael Koch  <konqueror at gmx.de>
+
+        * java/util/prefs/Preferences.java:
+        Import used classes explicitely.
+        * java/util/prefs/AbstractPreferences.java
+        (cachedChildren): New method.
+
+2004-01-03  Dalibor Topic <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2003-11-28  Ito Kazumitsu  <kaz at maczuka.gcd.org>
 
         * java/text/SimpleDateFormat.java (compileFormat):
Index: kaffe/libraries/javalib/java/util/prefs/AbstractPreferences.java
diff -u kaffe/libraries/javalib/java/util/prefs/AbstractPreferences.java:1.3 kaffe/libraries/javalib/java/util/prefs/AbstractPreferences.java:1.4
--- kaffe/libraries/javalib/java/util/prefs/AbstractPreferences.java:1.3	Sun Aug 10 18:47:55 2003
+++ kaffe/libraries/javalib/java/util/prefs/AbstractPreferences.java	Sat Jan  3 04:20:18 2004
@@ -183,6 +183,16 @@
     }
 
     /**
+     * Returns all known unremoved children of this node.
+     *
+     * @return All known unremoved children of this node
+     */
+    protected final AbstractPreferences[] cachedChildren()
+    {
+      return (AbstractPreferences[]) childCache.values().toArray();
+    }
+
+    /**
      * Returns all the direct sub nodes of this preferences node.
      * Needs access to the backing store to give a meaningfull answer.
      * <p>
Index: kaffe/libraries/javalib/java/util/prefs/Preferences.java
diff -u kaffe/libraries/javalib/java/util/prefs/Preferences.java:1.3 kaffe/libraries/javalib/java/util/prefs/Preferences.java:1.4
--- kaffe/libraries/javalib/java/util/prefs/Preferences.java:1.3	Wed Oct 22 10:35:00 2003
+++ kaffe/libraries/javalib/java/util/prefs/Preferences.java	Sat Jan  3 04:20:18 2004
@@ -45,7 +45,7 @@
 import java.security.Permission;
 import java.security.PrivilegedAction;
 
-import gnu.java.util.prefs.*;
+import gnu.java.util.prefs.NodeReader;
 
 /**
  * Preference node containing key value entries and subnodes.