Imported GNU Classpath 0.20

       * Makefile.am (AM_CPPFLAGS): Add classpath/include.
       * java/nio/charset/spi/CharsetProvider.java: New override file.
       * java/security/Security.java: Likewise.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109831 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 9 insertions, 14 deletions

diff --git a/libjava/classpath/gnu/xml/transform/MessageNode.java b/libjava/classpath/gnu/xml/transform/MessageNode.java
index 1df716836e7..e8e07c6da29 100644
--- a/libjava/classpath/gnu/xml/transform/MessageNode.java
+++ b/libjava/classpath/gnu/xml/transform/MessageNode.java
@@ -1,5 +1,5 @@
 /* MessageNode.java -- 
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004,2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,6 +37,7 @@ exception statement from your version. */
 
 package gnu.xml.transform;
 
+import java.util.logging.Logger;
 import javax.xml.namespace.QName;
 import javax.xml.transform.TransformerException;
 import org.w3c.dom.Document;
@@ -53,6 +54,8 @@ final class MessageNode
   extends TemplateNode
 {
 
+  static final Logger logger = Logger.getLogger("gnu.xml.transform");
+
   final boolean terminate;
 
   MessageNode(boolean terminate)
@@ -64,13 +67,9 @@ final class MessageNode
   {
     TemplateNode ret = new MessageNode(terminate);
     if (children != null)
-      {
-        ret.children = children.clone(stylesheet);
-      }
+      ret.children = children.clone(stylesheet);
     if (next != null)
-      {
-        ret.next = next.clone(stylesheet);
-      }
+      ret.next = next.clone(stylesheet);
     return ret;
   }
 
@@ -86,16 +85,12 @@ final class MessageNode
         DocumentFragment fragment = doc.createDocumentFragment();
         children.apply(stylesheet, mode, context, pos, len, fragment, null);
         String message = Expr.stringValue(fragment);
-        System.err.println(message);
+        logger.info(message);
         if (terminate)
-          {
-            stylesheet.terminated = true;
-          }
+          stylesheet.terminated = true;
       }
     if (next != null && !terminate)
-      {
-        next.apply(stylesheet, mode, context, pos, len, parent, nextSibling);
-      }
+      next.apply(stylesheet, mode, context, pos, len, parent, nextSibling);
   }
   
 }