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

27 files changed, 113 insertions, 249 deletions

diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacHavalSpi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacHavalSpi.java
index df1319cbfdb..2967ee900ce 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacHavalSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacHavalSpi.java
@@ -37,31 +37,18 @@ exception statement from your version.  */
 
 
 package gnu.javax.crypto.jce.mac;
+
 import gnu.java.security.Registry;
 
 /**
  * The implementation of the HMAC-HAVAL <i>Service Provider Interface</i>
  * (<b>SPI</b>) Adapter.
- *
- * @version Revision: $
  */
-public class HMacHavalSpi extends MacAdapter
+public class HMacHavalSpi
+    extends MacAdapter
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   public HMacHavalSpi()
   {
     super(Registry.HMAC_NAME_PREFIX + Registry.HAVAL_HASH);
   }
-
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD2Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD2Spi.java
index dd489639f29..dd648586657 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD2Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD2Spi.java
@@ -44,12 +44,9 @@ import gnu.java.security.Registry;
  * The implementation of the HMAC-MD2 <i>Service Provider Interface</i>
  * (<b>SPI</b>) adapter.
  */
-public final class HMacMD2Spi extends MacAdapter
+public final class HMacMD2Spi
+    extends MacAdapter
 {
-
-  // Constructors.
-  // -----------------------------------------------------------------------
-
   public HMacMD2Spi()
   {
     super(Registry.HMAC_NAME_PREFIX + Registry.MD2_HASH);
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD4Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD4Spi.java
index 6fadf02621b..939851ff537 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD4Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD4Spi.java
@@ -44,12 +44,9 @@ import gnu.java.security.Registry;
  * The implementation of the HMAC-MD4 <i>Service Provider Interface</i>
  * (<b>SPI</b>) adapter.
  */
-public final class HMacMD4Spi extends MacAdapter
+public final class HMacMD4Spi
+    extends MacAdapter
 {
-
-  // Constructors.
-  // -----------------------------------------------------------------------
-
   public HMacMD4Spi()
   {
     super(Registry.HMAC_NAME_PREFIX + Registry.MD4_HASH);
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD5Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD5Spi.java
index 2ef43974f82..e89fbfdbac9 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD5Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD5Spi.java
@@ -44,12 +44,9 @@ import gnu.java.security.Registry;
  * The implementation of the HMAC-MD5 <i>Service Provider Interface</i>
  * (<b>SPI</b>) adapter.
  */
-public final class HMacMD5Spi extends MacAdapter
+public final class HMacMD5Spi
+    extends MacAdapter
 {
-
-  // Constructors.
-  // -----------------------------------------------------------------------
-
   public HMacMD5Spi()
   {
     super(Registry.HMAC_NAME_PREFIX + Registry.MD5_HASH);
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java
index ad7a2340eed..834ec849a71 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java
@@ -44,12 +44,9 @@ import gnu.java.security.Registry;
  * The implementation of the HMAC-RIPEMD-128 <i>Service Provider Interface</i>
  * (<b>SPI</b>) adapter.
  */
-public final class HMacRipeMD128Spi extends MacAdapter
+public final class HMacRipeMD128Spi
+    extends MacAdapter
 {
-
-  // Constructors.
-  // -----------------------------------------------------------------------
-
   public HMacRipeMD128Spi()
   {
     super(Registry.HMAC_NAME_PREFIX + Registry.RIPEMD128_HASH);
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java
index c14e3b3bf24..b973ea18678 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java
@@ -44,12 +44,9 @@ import gnu.java.security.Registry;
  * The implementation of the HMAC-RIPEMD-160 <i>Service Provider Interface</i>
  * (<b>SPI</b>) adapter.
  */
-public final class HMacRipeMD160Spi extends MacAdapter
+public final class HMacRipeMD160Spi
+    extends MacAdapter
 {
-
-  // Constructors.
-  // -----------------------------------------------------------------------
-
   public HMacRipeMD160Spi()
   {
     super(Registry.HMAC_NAME_PREFIX + Registry.RIPEMD160_HASH);
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java
index f102c9ebcde..524aa823386 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java
@@ -44,12 +44,9 @@ import gnu.java.security.Registry;
  * The implementation of the HMAC-SHA-160 <i>Service Provider Interface</i>
  * (<b>SPI</b>) adapter.
  */
-public final class HMacSHA160Spi extends MacAdapter
+public final class HMacSHA160Spi
+    extends MacAdapter
 {
-
-  // Constructors.
-  // -----------------------------------------------------------------------
-
   public HMacSHA160Spi()
   {
     super(Registry.HMAC_NAME_PREFIX + Registry.SHA160_HASH);
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java
index cadad1cf5fa..4b0493bc63b 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java
@@ -37,29 +37,18 @@ exception statement from your version.  */
 
 
 package gnu.javax.crypto.jce.mac;
+
 import gnu.java.security.Registry;
 
 /**
- * <p>The implementation of the HMAC-SHA-256 <i>Service Provider Interface</i>
- * (<b>SPI</b>) adapter.</p>
+ * The implementation of the HMAC-SHA-256 <i>Service Provider Interface</i>
+ * (<b>SPI</b>) adapter.
  */
-public final class HMacSHA256Spi extends MacAdapter
+public final class HMacSHA256Spi
+    extends MacAdapter
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -----------------------------------------------------------------------
-
   public HMacSHA256Spi()
   {
     super(Registry.HMAC_NAME_PREFIX + Registry.SHA256_HASH);
   }
-
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
 }
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java
index 69ef38e50f6..92a5c9d2c69 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java
@@ -37,29 +37,18 @@ exception statement from your version.  */
 
 
 package gnu.javax.crypto.jce.mac;
+
 import gnu.java.security.Registry;
 
 /**
- * <p>The implementation of the HMAC-SHA-384 <i>Service Provider Interface</i>
- * (<b>SPI</b>) adapter.</p>
+ * The implementation of the HMAC-SHA-384 <i>Service Provider Interface</i>
+ * (<b>SPI</b>) adapter.
  */
-public class HMacSHA384Spi extends MacAdapter
+public class HMacSHA384Spi
+    extends MacAdapter
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -----------------------------------------------------------------------
-
   public HMacSHA384Spi()
   {
     super(Registry.HMAC_NAME_PREFIX + Registry.SHA384_HASH);
   }
-
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
 }
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java
index abceb4a92c9..f1ecd02e5a7 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java
@@ -37,29 +37,18 @@ exception statement from your version.  */
 
 
 package gnu.javax.crypto.jce.mac;
+
 import gnu.java.security.Registry;
 
 /**
- * <p>The implementation of the HMAC-SHA-512 <i>Service Provider Interface</i>
- * (<b>SPI</b>) adapter.</p>
+ * The implementation of the HMAC-SHA-512 <i>Service Provider Interface</i>
+ * (<b>SPI</b>) adapter.
  */
-public class HMacSHA512Spi extends MacAdapter
+public class HMacSHA512Spi
+    extends MacAdapter
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -----------------------------------------------------------------------
-
   public HMacSHA512Spi()
   {
     super(Registry.HMAC_NAME_PREFIX + Registry.SHA512_HASH);
   }
-
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
 }
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacTigerSpi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacTigerSpi.java
index 511993ea413..2d417ef4c58 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacTigerSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacTigerSpi.java
@@ -44,12 +44,9 @@ import gnu.java.security.Registry;
  * The implementation of the Tiger <i>Service Provider Interface</i>
  * (<b>SPI</b>) adapter.
  */
-public final class HMacTigerSpi extends MacAdapter
+public final class HMacTigerSpi
+    extends MacAdapter
 {
-
-  // Constructors.
-  // -----------------------------------------------------------------------
-
   public HMacTigerSpi()
   {
     super(Registry.HMAC_NAME_PREFIX + Registry.TIGER_HASH);
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java
index 706e0cd5a6b..1b936d71a2e 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java
@@ -44,12 +44,9 @@ import gnu.java.security.Registry;
  * The implementation of the HMAC-Whirlpool <i>Service Provider Interface</i>
  * (<b>SPI</b>) adapter.
  */
-public final class HMacWhirlpoolSpi extends MacAdapter
+public final class HMacWhirlpoolSpi
+    extends MacAdapter
 {
-
-  // Constructors.
-  // -----------------------------------------------------------------------
-
   public HMacWhirlpoolSpi()
   {
     super(Registry.HMAC_NAME_PREFIX + Registry.WHIRLPOOL_HASH);
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/MacAdapter.java b/libjava/classpath/gnu/javax/crypto/jce/mac/MacAdapter.java
index dc019ca20f4..d8c800ac728 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/MacAdapter.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/MacAdapter.java
@@ -50,32 +50,26 @@ import java.util.Map;
 import javax.crypto.MacSpi;
 
 /**
- * <p>The implementation of a generic {@link javax.crypto.Mac} adapter class
- * to wrap GNU Crypto MAC instances.</p>
- *
- * <p>This class defines the <i>Service Provider Interface</i> (<b>SPI</b>) for
+ * The implementation of a generic {@link javax.crypto.Mac} adapter class to
+ * wrap GNU MAC instances.
+ * <p>
+ * This class defines the <i>Service Provider Interface</i> (<b>SPI</b>) for
  * the {@link javax.crypto.Mac} class, which provides the functionality of a
  * message authentication code algorithm, such as the <i>Hashed Message
- * Authentication Code</i> (<b>HMAC</b>) algorithms.</p>
+ * Authentication Code</i> (<b>HMAC</b>) algorithms.
  */
-class MacAdapter extends MacSpi implements Cloneable
+class MacAdapter
+    extends MacSpi
+    implements Cloneable
 {
-
-  // Constants and variables
-  // -----------------------------------------------------------------------
-
   /** Our MAC instance. */
   protected IMac mac;
-
   /** Our MAC attributes. */
   protected Map attributes;
 
-  // Constructor(s)
-  // -----------------------------------------------------------------------
-
   /**
-   * <p>Creates a new Mac instance for the given name.</p>
-   *
+   * Creates a new Mac instance for the given name.
+   * 
    * @param name The name of the mac to create.
    */
   protected MacAdapter(String name)
@@ -88,7 +82,7 @@ class MacAdapter extends MacSpi implements Cloneable
    * Private constructor for cloning purposes.
    * 
    * @param mac a clone of the internal {@link IMac} instance.
-   * @param attributes a clone of the current {@link Map} of attributes. 
+   * @param attributes a clone of the current {@link Map} of attributes.
    */
   private MacAdapter(IMac mac, Map attributes)
   {
@@ -98,21 +92,11 @@ class MacAdapter extends MacSpi implements Cloneable
     this.attributes = attributes;
   }
 
-  // Class methods
-  // -----------------------------------------------------------------------
-
-  // Instance methods
-  // -----------------------------------------------------------------------
-
-  // Cloneable interface implementation ------------------------------------
-
   public Object clone() throws CloneNotSupportedException
   {
     return new MacAdapter((IMac) mac.clone(), new HashMap(attributes));
   }
 
-  // Instance methods implementing javax.crypto.MacSpi ---------------------
-
   protected byte[] engineDoFinal()
   {
     byte[] result = mac.digest();
@@ -128,10 +112,8 @@ class MacAdapter extends MacSpi implements Cloneable
   protected void engineInit(Key key, AlgorithmParameterSpec params)
       throws InvalidKeyException, InvalidAlgorithmParameterException
   {
-    if (!key.getFormat().equalsIgnoreCase("RAW"))
-      {
-        throw new InvalidKeyException("unknown key format " + key.getFormat());
-      }
+    if (! key.getFormat().equalsIgnoreCase("RAW"))
+      throw new InvalidKeyException("unknown key format " + key.getFormat());
     attributes.put(IMac.MAC_KEY_MATERIAL, key.getEncoded());
     mac.reset();
     mac.init(attributes);
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacAnubisImpl.java b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacAnubisImpl.java
index 4bfda4fd6cc..566e56fd1d1 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacAnubisImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacAnubisImpl.java
@@ -40,14 +40,11 @@ package gnu.javax.crypto.jce.mac;
 
 import gnu.java.security.Registry;
 
-public class OMacAnubisImpl extends MacAdapter
+public class OMacAnubisImpl
+    extends MacAdapter
 {
-
-  // Constructor.
-  // -------------------------------------------------------------------------
-
   public OMacAnubisImpl()
   {
     super(Registry.OMAC_PREFIX + Registry.ANUBIS_CIPHER);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.java b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.java
index 8d168e57be5..55768166f8a 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.java
@@ -40,14 +40,11 @@ package gnu.javax.crypto.jce.mac;
 
 import gnu.java.security.Registry;
 
-public class OMacBlowfishImpl extends MacAdapter
+public class OMacBlowfishImpl
+    extends MacAdapter
 {
-
-  // Constructor.
-  // -------------------------------------------------------------------------
-
   public OMacBlowfishImpl()
   {
     super(Registry.OMAC_PREFIX + Registry.BLOWFISH_CIPHER);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacCast5Impl.java b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacCast5Impl.java
index 3385d116bc4..535352c3908 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacCast5Impl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacCast5Impl.java
@@ -40,14 +40,11 @@ package gnu.javax.crypto.jce.mac;
 
 import gnu.java.security.Registry;
 
-public class OMacCast5Impl extends MacAdapter
+public class OMacCast5Impl
+    extends MacAdapter
 {
-
-  // Constructor.
-  // -------------------------------------------------------------------------
-
   public OMacCast5Impl()
   {
     super(Registry.OMAC_PREFIX + Registry.CAST5_CIPHER);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacDESImpl.java b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacDESImpl.java
index 3fb23bdefde..a01c0ac872a 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacDESImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacDESImpl.java
@@ -40,14 +40,11 @@ package gnu.javax.crypto.jce.mac;
 
 import gnu.java.security.Registry;
 
-public class OMacDESImpl extends MacAdapter
+public class OMacDESImpl
+    extends MacAdapter
 {
-
-  // Constructor.
-  // -------------------------------------------------------------------------
-
   public OMacDESImpl()
   {
     super(Registry.OMAC_PREFIX + Registry.DES_CIPHER);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacImpl.java b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacImpl.java
index f91902ae543..960c68aaf07 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacImpl.java
@@ -39,23 +39,17 @@ exception statement from your version.  */
 package gnu.javax.crypto.jce.mac;
 
 import gnu.java.security.Registry;
-import javax.crypto.MacSpi;
 
-public abstract class OMacImpl extends MacAdapter
+public abstract class OMacImpl
+    extends MacAdapter
 {
-
-  // Constructor.
-  // -------------------------------------------------------------------------
-
   protected OMacImpl(String name)
   {
     super(Registry.OMAC_PREFIX + name);
   }
 
-  // Inner classes.
-  // -------------------------------------------------------------------------
-
-  public class Anubis extends OMacImpl
+  public class Anubis
+      extends OMacImpl
   {
     public Anubis()
     {
@@ -63,7 +57,8 @@ public abstract class OMacImpl extends MacAdapter
     }
   }
 
-  public class Blowfish extends OMacImpl
+  public class Blowfish
+      extends OMacImpl
   {
     public Blowfish()
     {
@@ -71,7 +66,8 @@ public abstract class OMacImpl extends MacAdapter
     }
   }
 
-  public class Cast5 extends OMacImpl
+  public class Cast5
+      extends OMacImpl
   {
     public Cast5()
     {
@@ -79,7 +75,8 @@ public abstract class OMacImpl extends MacAdapter
     }
   }
 
-  public class DES extends OMacImpl
+  public class DES
+      extends OMacImpl
   {
     public DES()
     {
@@ -87,7 +84,8 @@ public abstract class OMacImpl extends MacAdapter
     }
   }
 
-  public class Khazad extends OMacImpl
+  public class Khazad
+      extends OMacImpl
   {
     public Khazad()
     {
@@ -95,7 +93,8 @@ public abstract class OMacImpl extends MacAdapter
     }
   }
 
-  public class Rijndael extends OMacImpl
+  public class Rijndael
+      extends OMacImpl
   {
     public Rijndael()
     {
@@ -103,7 +102,8 @@ public abstract class OMacImpl extends MacAdapter
     }
   }
 
-  public class Serpent extends OMacImpl
+  public class Serpent
+      extends OMacImpl
   {
     public Serpent()
     {
@@ -111,7 +111,8 @@ public abstract class OMacImpl extends MacAdapter
     }
   }
 
-  public class Square extends OMacImpl
+  public class Square
+      extends OMacImpl
   {
     public Square()
     {
@@ -119,7 +120,8 @@ public abstract class OMacImpl extends MacAdapter
     }
   }
 
-  public class TripleDES extends OMacImpl
+  public class TripleDES
+      extends OMacImpl
   {
     public TripleDES()
     {
@@ -127,11 +129,12 @@ public abstract class OMacImpl extends MacAdapter
     }
   }
 
-  public class Twofish extends OMacImpl
+  public class Twofish
+      extends OMacImpl
   {
     public Twofish()
     {
       super(Registry.TWOFISH_CIPHER);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacKhazadImpl.java b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacKhazadImpl.java
index 82c047c25a3..c349f9f5e0d 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacKhazadImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacKhazadImpl.java
@@ -40,14 +40,11 @@ package gnu.javax.crypto.jce.mac;
 
 import gnu.java.security.Registry;
 
-public class OMacKhazadImpl extends MacAdapter
+public class OMacKhazadImpl
+    extends MacAdapter
 {
-
-  // Constructor.
-  // -------------------------------------------------------------------------
-
   public OMacKhazadImpl()
   {
     super(Registry.OMAC_PREFIX + Registry.KHAZAD_CIPHER);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.java b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.java
index 47d3f6aae70..d63b777a32a 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.java
@@ -40,14 +40,11 @@ package gnu.javax.crypto.jce.mac;
 
 import gnu.java.security.Registry;
 
-public class OMacRijndaelImpl extends MacAdapter
+public class OMacRijndaelImpl
+    extends MacAdapter
 {
-
-  // Constructor.
-  // -------------------------------------------------------------------------
-
   public OMacRijndaelImpl()
   {
     super(Registry.OMAC_PREFIX + Registry.RIJNDAEL_CIPHER);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacSerpentImpl.java b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacSerpentImpl.java
index bec2c1f5c74..5c1b8a9b99e 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacSerpentImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacSerpentImpl.java
@@ -40,14 +40,11 @@ package gnu.javax.crypto.jce.mac;
 
 import gnu.java.security.Registry;
 
-public class OMacSerpentImpl extends MacAdapter
+public class OMacSerpentImpl
+    extends MacAdapter
 {
-
-  // Constructor.
-  // -------------------------------------------------------------------------
-
   public OMacSerpentImpl()
   {
     super(Registry.OMAC_PREFIX + Registry.SERPENT_CIPHER);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacSquareImpl.java b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacSquareImpl.java
index 0442b7caf25..c9d1b1aca07 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacSquareImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacSquareImpl.java
@@ -40,14 +40,11 @@ package gnu.javax.crypto.jce.mac;
 
 import gnu.java.security.Registry;
 
-public class OMacSquareImpl extends MacAdapter
+public class OMacSquareImpl
+    extends MacAdapter
 {
-
-  // Constructor.
-  // -------------------------------------------------------------------------
-
   public OMacSquareImpl()
   {
     super(Registry.OMAC_PREFIX + Registry.SQUARE_CIPHER);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.java b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.java
index 0defdd1fd36..4f58723d3f7 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.java
@@ -40,14 +40,11 @@ package gnu.javax.crypto.jce.mac;
 
 import gnu.java.security.Registry;
 
-public class OMacTripleDESImpl extends MacAdapter
+public class OMacTripleDESImpl
+    extends MacAdapter
 {
-
-  // Constructor.
-  // -------------------------------------------------------------------------
-
   public OMacTripleDESImpl()
   {
     super(Registry.OMAC_PREFIX + Registry.TRIPLEDES_CIPHER);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacTwofishImpl.java b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacTwofishImpl.java
index a12f9f30e85..4c816a09658 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/OMacTwofishImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/OMacTwofishImpl.java
@@ -40,14 +40,11 @@ package gnu.javax.crypto.jce.mac;
 
 import gnu.java.security.Registry;
 
-public class OMacTwofishImpl extends MacAdapter
+public class OMacTwofishImpl
+    extends MacAdapter
 {
-
-  // Constructor.
-  // -------------------------------------------------------------------------
-
   public OMacTwofishImpl()
   {
     super(Registry.OMAC_PREFIX + Registry.TWOFISH_CIPHER);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/TMMH16Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/TMMH16Spi.java
index 1734e1e695b..8a40f6e7082 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/TMMH16Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/TMMH16Spi.java
@@ -51,27 +51,19 @@ import java.security.spec.AlgorithmParameterSpec;
  * The implementation of the TMMH16 <i>Service Provider Interface</i>
  * (<b>SPI</b>) adapter.
  */
-public final class TMMH16Spi extends MacAdapter
+public final class TMMH16Spi
+    extends MacAdapter
 {
-
-  // Constructors.
-  // -----------------------------------------------------------------------
-
   public TMMH16Spi()
   {
     super(Registry.TMMH16);
   }
 
-  // Instance methods overriding MacAdapter.
-  // -----------------------------------------------------------------------
-
   protected void engineInit(Key key, AlgorithmParameterSpec params)
       throws InvalidKeyException, InvalidAlgorithmParameterException
   {
-    if (!(params instanceof TMMHParameterSpec))
-      {
-        throw new InvalidAlgorithmParameterException();
-      }
+    if (! (params instanceof TMMHParameterSpec))
+      throw new InvalidAlgorithmParameterException();
     TMMHParameterSpec spec = (TMMHParameterSpec) params;
     attributes.put(TMMH16.TAG_LENGTH, spec.getTagLength());
     attributes.put(TMMH16.KEYSTREAM, spec.getKeystream());
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/UHash32Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/UHash32Spi.java
index af678c0fa8a..825edc1739c 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/UHash32Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/UHash32Spi.java
@@ -44,12 +44,9 @@ import gnu.java.security.Registry;
  * The implementation of the UHash-32 <i>Service Provider Interface</i>
  * (<b>SPI</b>) adapter.
  */
-public final class UHash32Spi extends MacAdapter
+public final class UHash32Spi
+    extends MacAdapter
 {
-
-  // Constructors.
-  // -----------------------------------------------------------------------
-
   public UHash32Spi()
   {
     super(Registry.UHASH32);
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/UMac32Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/UMac32Spi.java
index 4e90468b10c..fc05e532106 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/UMac32Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/UMac32Spi.java
@@ -51,32 +51,22 @@ import java.security.spec.AlgorithmParameterSpec;
  * The implementation of the UMAC-32 <i>Service Provider Interface</i>
  * (<b>SPI</b>) adapter.
  */
-public final class UMac32Spi extends MacAdapter
+public final class UMac32Spi
+    extends MacAdapter
 {
-
-  // Constructors.
-  // -----------------------------------------------------------------------
-
   public UMac32Spi()
   {
     super(Registry.UMAC32);
   }
 
-  // Instance methods overriding MacAdapter.
-  // -----------------------------------------------------------------------
-
   protected void engineInit(Key key, AlgorithmParameterSpec params)
       throws InvalidKeyException, InvalidAlgorithmParameterException
   {
-    if (!(params instanceof UMac32ParameterSpec))
-      {
-        throw new InvalidAlgorithmParameterException();
-      }
+    if (! (params instanceof UMac32ParameterSpec))
+      throw new InvalidAlgorithmParameterException();
     if (params != null)
-      {
-        attributes.put(UMac32.NONCE_MATERIAL,
-                       ((UMac32ParameterSpec) params).getNonce());
-      }
+      attributes.put(UMac32.NONCE_MATERIAL,
+                     ((UMac32ParameterSpec) params).getNonce());
     try
       {
         super.engineInit(key, null);