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, 43 insertions, 70 deletions

diff --git a/libjava/classpath/gnu/javax/crypto/sasl/OutputBuffer.java b/libjava/classpath/gnu/javax/crypto/sasl/OutputBuffer.java
index d219e7e9f0e..92e34dfbfe7 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/OutputBuffer.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/OutputBuffer.java
@@ -46,31 +46,25 @@ import java.io.IOException;
 import java.math.BigInteger;
 
 /**
- * <p>The implementation of an outgoing SASL buffer.</p>
- *
- * <p>The data elements this class caters for are described in [1].</p>
- *
- * <p>References:</p>
+ * The implementation of an outgoing SASL buffer.
+ * <p>
+ * The data elements this class caters for are described in [1].
+ * <p>
+ * References:
  * <ol>
- *    <li><a href="http://www.ietf.org/internet-drafts/draft-burdis-cat-srp-sasl-09.txt">
- *    Secure Remote Password Authentication Mechanism</a>;<br/>
- *    draft-burdis-cat-srp-sasl-09,<br/>
- *    <a href="mailto:keith@rucus.ru.ac.za">Keith Burdis</a> and
- *    <a href="mailto:raif@forge.com.au">Ra&iuml;f S. Naffah</a>.</li>
+ * <li><a
+ * href="http://www.ietf.org/internet-drafts/draft-burdis-cat-srp-sasl-09.txt">
+ * Secure Remote Password Authentication Mechanism</a>;<br/>
+ * draft-burdis-cat-srp-sasl-09,<br/> <a
+ * href="mailto:keith@rucus.ru.ac.za">Keith Burdis</a> and <a
+ * href="mailto:raif@forge.com.au">Ra&iuml;f S. Naffah</a>.</li>
  * </ol>
  */
 public class OutputBuffer
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
   /** The internal output stream. */
   private ByteArrayOutputStream out;
 
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   public OutputBuffer()
   {
     super();
@@ -78,16 +72,10 @@ public class OutputBuffer
     out = new ByteArrayOutputStream();
   }
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
-
   /**
-   * <p>Encodes a SASL scalar quantity, <code>count</code>-octet long, to the
-   * current buffer.</p>
-   *
+   * Encodes a SASL scalar quantity, <code>count</code>-octet long, to the
+   * current buffer.
+   * 
    * @param count number of octets to encode <code>b</code> with.
    * @param b the scalar quantity.
    * @throws SaslEncodingException if an encoding size constraint is violated.
@@ -96,21 +84,17 @@ public class OutputBuffer
   public void setScalar(int count, int b) throws IOException
   {
     if (count < 0 || count > 4)
-      {
-        throw new SaslEncodingException("Invalid SASL scalar octet count: "
-                                        + String.valueOf(count));
-      }
+      throw new SaslEncodingException("Invalid SASL scalar octet count: "
+                                      + String.valueOf(count));
     byte[] element = new byte[count];
     for (int i = count; --i >= 0; b >>>= 8)
-      {
-        element[i] = (byte) b;
-      }
+      element[i] = (byte) b;
     out.write(element);
   }
 
   /**
-   * <p>Encodes a SASL OS to the current buffer.</p>
-   *
+   * Encodes a SASL OS to the current buffer.
+   * 
    * @param b the OS element.
    * @throws SaslEncodingException if an encoding size constraint is violated.
    * @throws IOException if any other I/O exception occurs during the operation.
@@ -119,16 +103,14 @@ public class OutputBuffer
   {
     final int length = b.length;
     if (length > Registry.SASL_ONE_BYTE_MAX_LIMIT)
-      {
-        throw new SaslEncodingException("SASL octet-sequence too long");
-      }
+      throw new SaslEncodingException("SASL octet-sequence too long");
     out.write(length & 0xFF);
     out.write(b);
   }
 
   /**
-   * <p>Encodes a SASL EOS to the current buffer.</p>
-   *
+   * Encodes a SASL EOS to the current buffer.
+   * 
    * @param b the EOS element.
    * @throws SaslEncodingException if an encoding size constraint is violated.
    * @throws IOException if any other I/O exception occurs during the operation.
@@ -137,17 +119,15 @@ public class OutputBuffer
   {
     final int length = b.length;
     if (length > Registry.SASL_TWO_BYTE_MAX_LIMIT)
-      {
-        throw new SaslEncodingException("SASL extended octet-sequence too long");
-      }
-    byte[] lengthBytes = { (byte) (length >>> 8), (byte) length };
+      throw new SaslEncodingException("SASL extended octet-sequence too long");
+    byte[] lengthBytes = { (byte)(length >>> 8), (byte) length };
     out.write(lengthBytes);
     out.write(b);
   }
 
   /**
-   * <p>Encodes a SASL MPI to the current buffer.</p>
-   *
+   * Encodes a SASL MPI to the current buffer.
+   * 
    * @param val the MPI element.
    * @throws SaslEncodingException if an encoding size constraint is violated.
    * @throws IOException if any other I/O exception occurs during the operation.
@@ -157,21 +137,19 @@ public class OutputBuffer
     byte[] b = Util.trim(val);
     final int length = b.length;
     if (length > Registry.SASL_TWO_BYTE_MAX_LIMIT)
-      {
-        throw new SaslEncodingException("SASL multi-precision integer too long");
-      }
-    byte[] lengthBytes = { (byte) (length >>> 8), (byte) length };
+      throw new SaslEncodingException("SASL multi-precision integer too long");
+    byte[] lengthBytes = { (byte)(length >>> 8), (byte) length };
     out.write(lengthBytes);
     out.write(b);
   }
 
   /**
-   * <p>Encodes a SASL Text to the current buffer.</p>
-   *
+   * Encodes a SASL Text to the current buffer.
+   * 
    * @param str the Text element.
    * @throws SaslEncodingException if an encoding size constraint is violated.
    * @throws SaslEncodingException if the UTF-8 encoding is not supported on
-   * this platform.
+   *           this platform.
    * @throws IOException if any other I/O exception occurs during the operation.
    */
   public void setText(String str) throws IOException
@@ -179,18 +157,16 @@ public class OutputBuffer
     byte[] b = str.getBytes("UTF8");
     final int length = b.length;
     if (length > Registry.SASL_TWO_BYTE_MAX_LIMIT)
-      {
-        throw new SaslEncodingException("SASL text too long");
-      }
-    byte[] lengthBytes = { (byte) (length >>> 8), (byte) length };
+      throw new SaslEncodingException("SASL text too long");
+    byte[] lengthBytes = { (byte)(length >>> 8), (byte) length };
     out.write(lengthBytes);
     out.write(b);
   }
 
   /**
-   * <p>Returns the encoded form of the current buffer including the 4-byte
-   * length header.</p>
-   *
+   * Returns the encoded form of the current buffer including the 4-byte length
+   * header.
+   * 
    * @throws SaslEncodingException if an encoding size constraint is violated.
    */
   public byte[] encode() throws SaslEncodingException
@@ -198,28 +174,25 @@ public class OutputBuffer
     byte[] buffer = wrap();
     final int length = buffer.length;
     byte[] result = new byte[length + 4];
-    result[0] = (byte) (length >>> 24);
-    result[1] = (byte) (length >>> 16);
-    result[2] = (byte) (length >>> 8);
+    result[0] = (byte)(length >>> 24);
+    result[1] = (byte)(length >>> 16);
+    result[2] = (byte)(length >>> 8);
     result[3] = (byte) length;
     System.arraycopy(buffer, 0, result, 4, length);
-
     return result;
   }
 
   /**
-   * <p>Returns the encoded form of the current buffer excluding the 4-byte
-   * length header.</p>
-   *
+   * Returns the encoded form of the current buffer excluding the 4-byte length
+   * header.
+   * 
    * @throws SaslEncodingException if an encoding size constraint is violated.
    */
   public byte[] wrap() throws SaslEncodingException
   {
     final int length = out.size();
     if (length > Registry.SASL_BUFFER_MAX_LIMIT || length < 0)
-      {
-        throw new SaslEncodingException("SASL buffer too long");
-      }
+      throw new SaslEncodingException("SASL buffer too long");
     return out.toByteArray();
   }
 }