2006-08-14 Mark Wielaard <mark@klomp.org>

       Imported GNU Classpath 0.92
       * HACKING: Add more importing hints. Update automake version
       requirement.

       * configure.ac (gconf-peer): New enable AC argument.
       Add --disable-gconf-peer and --enable-default-preferences-peer
       to classpath configure when gconf is disabled.
       * scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
       gnu/java/awt/dnd/peer/gtk to bc. Classify
       gnu/java/security/Configuration.java as generated source file.

       * gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
       gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
       gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
       gnu/java/lang/management/VMThreadMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryMXBeanImpl.java,
       gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
       classes.
       * java/lang/management/VMManagementFactory.java: Likewise.
       * java/net/VMURLConnection.java: Likewise.
       * gnu/java/nio/VMChannel.java: Likewise.

       * java/lang/Thread.java (getState): Add stub implementation.
       * java/lang/Class.java (isEnum): Likewise.
       * java/lang/Class.h (isEnum): Likewise.

       * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.

       * javax/naming/spi/NamingManager.java: New override for StackWalker
       functionality.

       * configure, sources.am, Makefile.in, gcj/Makefile.in,
       include/Makefile.in, testsuite/Makefile.in: Regenerated.


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

1 files changed, 21 insertions, 38 deletions

diff --git a/libjava/classpath/gnu/javax/crypto/mac/MacOutputStream.java b/libjava/classpath/gnu/javax/crypto/mac/MacOutputStream.java
index a48d25ba3a5..739a78497a7 100644
--- a/libjava/classpath/gnu/javax/crypto/mac/MacOutputStream.java
+++ b/libjava/classpath/gnu/javax/crypto/mac/MacOutputStream.java
@@ -43,29 +43,23 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 /**
- * <p>A filtering output stream that computes a MAC (message authentication
- * code) over all data written to the stream.</p>
+ * A filtering output stream that computes a MAC (message authentication code)
+ * over all data written to the stream.
  */
-public class MacOutputStream extends FilterOutputStream
+public class MacOutputStream
+    extends FilterOutputStream
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
   /** The digesting state. The MAC is updated only if this flag is true. */
   private boolean digesting;
-
   /** The MAC being updated. */
   private IMac mac;
 
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   /**
-   * <p>Creates a new <code>MacOutputStream</code>. The stream is initially set
+   * Creates a new <code>MacOutputStream</code>. The stream is initially set
    * to digest data written, the <code>mac</code> argument must have already
-   * been initialized, and the <code>mac</code> argument is <b>not</b> cloned.</p>
-   *
+   * been initialized, and the <code>mac</code> argument is <b>not</b>
+   * cloned.
+   * 
    * @param out The underlying output stream.
    * @param mac The mac instance to use.
    */
@@ -73,19 +67,14 @@ public class MacOutputStream extends FilterOutputStream
   {
     super(out);
     if (mac == null)
-      {
-        throw new NullPointerException();
-      }
+      throw new NullPointerException();
     this.mac = mac;
     digesting = true;
   }
 
-  // Instance methods
-  // -------------------------------------------------------------------------
-
   /**
-   * <p>Returns the MAC this stream is updating.</p>
-   *
+   * Returns the MAC this stream is updating.
+   * 
    * @return The MAC.
    */
   public IMac getMac()
@@ -94,25 +83,23 @@ public class MacOutputStream extends FilterOutputStream
   }
 
   /**
-   * <p>Sets the MAC this stream is updating, which must have already been
-   * initialized. The argument is not cloned by this method.</p>
-   *
+   * Sets the MAC this stream is updating, which must have already been
+   * initialized. The argument is not cloned by this method.
+   * 
    * @param mac The non-null new MAC.
    * @throws NullPointerException If the argument is null.
    */
   public void setMac(IMac mac)
   {
     if (mac == null)
-      {
-        throw new NullPointerException();
-      }
+      throw new NullPointerException();
     this.mac = mac;
   }
 
   /**
-   * <p>Turns the digesting state on or off. When off, the MAC will not be
-   * updated when data is written to the stream.</p>
-   *
+   * Turns the digesting state on or off. When off, the MAC will not be updated
+   * when data is written to the stream.
+   * 
    * @param flag The new digesting state.
    */
   public void on(boolean flag)
@@ -123,18 +110,14 @@ public class MacOutputStream extends FilterOutputStream
   public void write(int b) throws IOException
   {
     if (digesting)
-      {
-        mac.update((byte) b);
-      }
+      mac.update((byte) b);
     out.write(b);
   }
 
   public void write(byte[] buf, int off, int len) throws IOException
   {
     if (digesting)
-      {
-        mac.update(buf, off, len);
-      }
+      mac.update(buf, off, len);
     out.write(buf, off, len);
   }
-}
\ No newline at end of file
+}