Imported GNU Classpath 0.90

       Imported GNU Classpath 0.90
       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r111942

1 files changed, 13 insertions, 23 deletions

diff --git a/libjava/classpath/gnu/xml/transform/WhenNode.java b/libjava/classpath/gnu/xml/transform/WhenNode.java
index 231f2693b5b..fe3f403ab0c 100644
--- a/libjava/classpath/gnu/xml/transform/WhenNode.java
+++ b/libjava/classpath/gnu/xml/transform/WhenNode.java
@@ -1,5 +1,5 @@
 /* WhenNode.java -- 
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004,2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -62,19 +62,15 @@ final class WhenNode
   {
     TemplateNode ret = new WhenNode(test.clone(stylesheet));
     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;
   }
 
   void doApply(Stylesheet stylesheet, QName mode,
-             Node context, int pos, int len,
-             Node parent, Node nextSibling)
+               Node context, int pos, int len,
+               Node parent, Node nextSibling)
     throws TransformerException
   {
     Object ret = test.evaluate(context, pos, len);
@@ -84,35 +80,29 @@ final class WhenNode
     if (success)
       {
         if (children != null)
-          {
-            children.apply(stylesheet, mode,
-                           context, pos, len,
-                           parent, nextSibling);
-          }
+          children.apply(stylesheet, mode,
+                         context, pos, len,
+                         parent, nextSibling);
       }
     else
       {
         if (next != null)
-          {
-            next.apply(stylesheet, mode,
-                       context, pos, len,
-                       parent, nextSibling);
-          }
+          next.apply(stylesheet, mode,
+                     context, pos, len,
+                     parent, nextSibling);
       }
   }
   
   public boolean references(QName var)
   {
     if (test != null && test.references(var))
-      {
-        return true;
-      }
+      return true;
     return super.references(var);
   }
   
   public String toString()
   {
-    StringBuffer buf = new StringBuffer(getClass().getName());
+    StringBuffer buf = new StringBuffer("when");
     buf.append('[');
     buf.append("test=");
     buf.append(test);