From 0f2d140b31027d9f26c0c4ac7b6aa9f225856cdd Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Sun, 7 Jan 2007 21:08:21 +0000
Subject: svn merge -r115644:120507
 svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_1-branch/libjava/ in libjava/

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/fc5-4_1-branch@120555 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/classpath/ChangeLog.gcj                       | 8 ++++++++
 libjava/classpath/gnu/java/util/prefs/NodeReader.java | 2 --
 libjava/classpath/gnu/java/util/prefs/NodeWriter.java | 3 ---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index b784096d448..38ce22bdb39 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,11 @@
+2006-08-18  Tom Tromey  <tromey@redhat.com>
+
+	* gnu/java/util/prefs/NodeWriter.java (writeParents): Removed
+	debugging prints.
+	* gnu/java/util/prefs/NodeReader.java (readNodes): Removed debugging
+	print.
+	(readEntries): Likewise.
+
 2006-07-12  Tom Tromey  <tromey@redhat.com>
 
 	* java/util/zip/ZipFile.java (getInputStream): Call addDummyByte
diff --git a/libjava/classpath/gnu/java/util/prefs/NodeReader.java b/libjava/classpath/gnu/java/util/prefs/NodeReader.java
index 4cd52e5dbf9..ae5510e1c13 100644
--- a/libjava/classpath/gnu/java/util/prefs/NodeReader.java
+++ b/libjava/classpath/gnu/java/util/prefs/NodeReader.java
@@ -124,7 +124,6 @@ public class NodeReader {
             skipTill("name=\"");
             String name = readTill("\"");
             Preferences subnode = node.node(name);
-            System.out.println("Found subnode: " + subnode.absolutePath());
             readMap(subnode);
             readNodes(subnode);
             skipTill("</node>");
@@ -160,7 +159,6 @@ public class NodeReader {
             String key = readTill("\"");
             skipTill("value=\"");
             String value = readTill("\"");
-            System.out.println("Key: " + key + " Value: " + value);
             node.put(key, value);
         }
     }
diff --git a/libjava/classpath/gnu/java/util/prefs/NodeWriter.java b/libjava/classpath/gnu/java/util/prefs/NodeWriter.java
index 1eed9e66e2d..fee957c848e 100644
--- a/libjava/classpath/gnu/java/util/prefs/NodeWriter.java
+++ b/libjava/classpath/gnu/java/util/prefs/NodeWriter.java
@@ -198,9 +198,6 @@ public class NodeWriter {
             StringTokenizer st = new StringTokenizer(path);
             parents = st.countTokens();
 
-            System.out.println("path: " + path);
-            System.out.println("parents: " + parents);
-
             for (int i=0; i<parents; i++) {
                 String name = st.nextToken();
                 indent(i+2);
-- 
cgit v1.2.3