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, 7 insertions, 28 deletions

diff --git a/libjava/classpath/gnu/javax/crypto/jce/params/DERReader.java b/libjava/classpath/gnu/javax/crypto/jce/params/DERReader.java
index f61423255fc..68c68027966 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/params/DERReader.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/params/DERReader.java
@@ -43,15 +43,10 @@ import java.math.BigInteger;
 class DERReader
 {
   byte source[];
-
   int pos;
-
   static final int UNIVERSAL = 1;
-
   static final int APPLICATION = 2;
-
   static final int CONTEXT_SPECIFIC = 3;
-
   static final int PRIVATE = 4;
 
   public DERReader()
@@ -86,53 +81,37 @@ class DERReader
     return new BigInteger(getPrimitive());
   }
 
-  //Reads Primitive, definite-length method
+  // Reads Primitive, definite-length method
   private byte[] getPrimitive() throws DEREncodingException
   {
     int tmp = pos;
-
-    //Read Identifier
+    // Read Identifier
     byte identifier = source[tmp++];
     if ((0x20 & identifier) != 0)
       throw new DEREncodingException();
     int type = translateLeadIdentifierByte(identifier);
-    //System.out.println("Type: " + type);
-
-    //get tag
+    // get tag
     int tag = (0x1f & identifier);
-    //if( tag == 0x1f)
-    //	tag = getIdentifier(tmp);
-    //System.out.println("Tag: " + tag);
-
-    //get length
-    byte len = source[tmp]; //may be length of length parameter
+    // get length
+    byte len = source[tmp]; // may be length of length parameter
     long length = 0x7f & len;
     int i;
     if ((0x80 & len) != 0)
       {
-        //System.out.println("Extra Long Length");
         len &= 0x7f;
-        //System.out.println("Length of Length: " + len);
-        //get length here
+        // get length here
         length = 0;
         for (i = 0; i < len; i++)
           {
             tmp++;
             length <<= 8;
             length += (source[tmp] < 0) ? (256 + source[tmp]) : source[tmp];
-            //System.out.println("Length of Length: " + length);
           }
         tmp++;
       }
     else
       tmp++;
 
-    /*System.out.println("Position: " + tmp);
-     System.out.println("Length: " + length);
-     for( i = 0; i < 10; i++)
-     System.out.print(source[tmp + i] + " ");
-     System.out.println();*/
-
     byte tmpb[] = new byte[(int) length];
     System.arraycopy(source, tmp, tmpb, 0, (int) length);
     pos = (int) (tmp + length);
@@ -157,4 +136,4 @@ class DERReader
       tpos++;
     return tpos;
   }
-}
\ No newline at end of file
+}