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, 9 insertions, 35 deletions

diff --git a/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java b/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java
index 99e95eaeca0..9047ebd5c6e 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java
@@ -45,65 +45,39 @@ import gnu.javax.crypto.sasl.SaslUtil;
  */
 public class AnonymousUtil
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   /** Trivial private constructor to enforce Singleton pattern. */
   private AnonymousUtil()
   {
     super();
   }
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
   static boolean isValidTraceInformation(String traceInformation)
   {
     if (traceInformation == null)
-      {
-        return false;
-      }
+      return false;
     if (traceInformation.length() == 0)
-      {
-        return true;
-      }
+      return true;
     if (SaslUtil.validEmailAddress(traceInformation))
-      {
-        return true;
-      }
+      return true;
     return isValidToken(traceInformation);
   }
 
   static boolean isValidToken(String token)
   {
     if (token == null)
-      {
-        return false;
-      }
+      return false;
     if (token.length() == 0)
-      {
-        return false;
-      }
+      return false;
     if (token.length() > 255)
-      {
-        return false;
-      }
+      return false;
     if (token.indexOf('@') != -1)
-      {
-        return false;
-      }
+      return false;
     for (int i = 0; i < token.length(); i++)
       {
         char c = token.charAt(i);
         if (c < 0x20 || c > 0x7E)
-          {
-            return false;
-          }
+          return false;
       }
     return true;
   }
-}
\ No newline at end of file
+}