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

libjava/classpath/gnu/xml/transform/TransformerImpl.java

@@ -162,7 +162,7 @@ class TransformerImpl
           }
         // Make a copy of the source node, and strip it
         context = context.cloneNode(true);
-        strip(context);
+        strip(stylesheet, context);
         // XSLT transformation
         try
           {
@@ -321,7 +321,7 @@ class TransformerImpl
     if (indent)
       {
         parent.normalize();
-        strip(parent);
+        strip(stylesheet, parent);
         Document resultDoc = (parent instanceof Document) ?
           (Document) parent :
           parent.getOwnerDocument();
@@ -393,7 +393,7 @@ class TransformerImpl
   /**
    * Strip whitespace from the source tree.
    */
-  boolean strip(Node node)
+  static boolean strip(Stylesheet stylesheet, Node node)
     throws TransformerConfigurationException
   {
     short nt = node.getNodeType();
@@ -444,7 +444,7 @@ class TransformerImpl
         Node child = node.getFirstChild();
         while (child != null)
           {
-            boolean remove = strip(child);
+            boolean remove = strip(stylesheet, child);
             Node next = child.getNextSibling();
             if (remove)
               node.removeChild(child);
@@ -691,7 +691,7 @@ class TransformerImpl
                 for (Iterator i = children.iterator(); i.hasNext(); )
                   {
                     ctx = (Node) i.next();
-                    reindent(doc, ctx, offset + 1);
+                    reindent(doc, ctx, offset);
                   }
               }
             else
@@ -709,9 +709,9 @@ class TransformerImpl
                   }
                 buf = new StringBuffer();
                 buf.append('\n');
-                ws = buf.toString();
                 for (int i = 0; i < offset; i++)
                   buf.append(INDENT_WHITESPACE);
+                ws = buf.toString();
                 node.appendChild(doc.createTextNode(ws));
               }
           }