Index: java/lang/Class.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/Class.java,v retrieving revision 1.24 diff -u -r1.24 Class.java --- java/lang/Class.java 13 Oct 2004 08:24:05 -0000 1.24 +++ java/lang/Class.java 22 Oct 2004 17:52:29 -0000 @@ -102,7 +102,7 @@ /* We use an inner class, so that Class doesn't have a static initializer */ private static final class StaticData { - final static ProtectionDomain unknownProtectionDomain; + static final ProtectionDomain unknownProtectionDomain; static { @@ -112,7 +112,7 @@ } } - transient final Object vmdata; + final transient Object vmdata; /** newInstance() caches the default constructor */ private transient Constructor constructor; Index: java/lang/StringBuffer.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/StringBuffer.java,v retrieving revision 1.27 diff -u -r1.27 StringBuffer.java --- java/lang/StringBuffer.java 17 Apr 2004 17:08:23 -0000 1.27 +++ java/lang/StringBuffer.java 22 Oct 2004 17:52:30 -0000 @@ -109,7 +109,7 @@ /** * The default capacity of a buffer. */ - private final static int DEFAULT_CAPACITY = 16; + private static final int DEFAULT_CAPACITY = 16; /** * Create a new StringBuffer with default capacity 16. Index: java/lang/Throwable.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/Throwable.java,v retrieving revision 1.25 diff -u -r1.25 Throwable.java --- java/lang/Throwable.java 26 Sep 2004 17:05:53 -0000 1.25 +++ java/lang/Throwable.java 22 Oct 2004 17:52:30 -0000 @@ -401,8 +401,7 @@ */ private static class StaticData { - - final static String nl; + static final String nl; static { Index: java/security/spec/DSAParameterSpec.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/security/spec/DSAParameterSpec.java,v retrieving revision 1.5 diff -u -r1.5 DSAParameterSpec.java --- java/security/spec/DSAParameterSpec.java 2 Apr 2004 21:29:34 -0000 1.5 +++ java/security/spec/DSAParameterSpec.java 22 Oct 2004 17:52:30 -0000 @@ -37,16 +37,17 @@ package java.security.spec; -import java.security.interfaces.DSAParams; + import java.math.BigInteger; +import java.security.interfaces.DSAParams; /** - DSA Parameter class Specification. Used to maintain the DSA - Parameters. - - @since JDK 1.2 - - @author Mark Benvenuto + * DSA Parameter class Specification. Used to maintain the DSA + * Parameters. + * + * @since 1.2 + * + * @author Mark Benvenuto */ public class DSAParameterSpec implements AlgorithmParameterSpec, DSAParams { @@ -55,46 +56,46 @@ private BigInteger g = null; /** - Constructs a new DSAParameterSpec with the specified p, q, and g. - - @param p the prime - @param q the sub-prime - @param g the base - */ + * Constructs a new DSAParameterSpec with the specified p, q, and g. + * + * @param p the prime + * @param q the sub-prime + * @param g the base + */ public DSAParameterSpec(BigInteger p, BigInteger q, BigInteger g) { this.p = p; this.q = q; this.g = g; } + /** - Returns p for the DSA algorithm. - - @return Returns the requested BigInteger - */ + * Returns p for the DSA algorithm. + * + * @return Returns the requested BigInteger + */ public BigInteger getP() { return this.p; } /** - Returns p for the DSA algorithm. - - @return Returns the requested BigInteger - */ + * Returns p for the DSA algorithm. + * + * @return Returns the requested BigInteger + */ public BigInteger getQ() { return this.q; } /** - Returns g for the DSA algorithm. - - @return Returns the requested BigInteger - */ + * Returns g for the DSA algorithm. + * + * @return Returns the requested BigInteger + */ public BigInteger getG() { return this.g; } - -} +} \ No newline at end of file Index: java/util/Currency.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Currency.java,v retrieving revision 1.5 diff -u -r1.5 Currency.java --- java/util/Currency.java 20 Oct 2004 21:47:04 -0000 1.5 +++ java/util/Currency.java 22 Oct 2004 17:52:30 -0000 @@ -100,7 +100,7 @@ * @see #readResolve() * @serial ignored. */ - private transient static Map cache; + private static transient Map cache; /** * Instantiates the cache. Index: java/util/ResourceBundle.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/ResourceBundle.java,v retrieving revision 1.24 diff -u -r1.24 ResourceBundle.java --- java/util/ResourceBundle.java 8 Jun 2004 19:00:43 -0000 1.24 +++ java/util/ResourceBundle.java 22 Oct 2004 17:52:31 -0000 @@ -1,5 +1,6 @@ /* ResourceBundle -- aids in loading resource bundles - Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,10 +39,10 @@ package java.util; +import java.io.IOException; +import java.io.InputStream; import java.lang.ref.Reference; import java.lang.ref.SoftReference; -import java.io.InputStream; -import java.io.IOException; import java.security.AccessController; import java.security.PrivilegedAction; @@ -470,11 +471,9 @@ * @param bundle the backup (parent) bundle * @return the resource bundle if it was loaded, otherwise the backup */ - private static final ResourceBundle tryBundle(String localizedName, - Locale locale, - ClassLoader classloader, - ResourceBundle bundle, - HashMap cache) + private static ResourceBundle tryBundle(String localizedName, Locale locale, + ClassLoader classloader, + ResourceBundle bundle, HashMap cache) { // First look into the cache. if (cache.containsKey(localizedName)) @@ -564,11 +563,10 @@ * @param bundle the backup (parent) bundle * @return the resource bundle if it was loaded, otherwise the backup */ - private static final ResourceBundle tryLocalBundle(String baseName, - Locale locale, - ClassLoader classloader, - ResourceBundle bundle, - HashMap cache) + private static ResourceBundle tryLocalBundle(String baseName, Locale locale, + ClassLoader classloader, + ResourceBundle bundle, + HashMap cache) { final String language = locale.getLanguage(); final String country = locale.getCountry(); Index: java/util/zip/DeflaterConstants.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/zip/DeflaterConstants.java,v retrieving revision 1.3 diff -u -r1.3 DeflaterConstants.java --- java/util/zip/DeflaterConstants.java 22 Jan 2002 22:27:02 -0000 1.3 +++ java/util/zip/DeflaterConstants.java 22 Oct 2004 17:52:31 -0000 @@ -37,41 +37,42 @@ package java.util.zip; -interface DeflaterConstants { - final static boolean DEBUGGING = false; - - final static int STORED_BLOCK = 0; - final static int STATIC_TREES = 1; - final static int DYN_TREES = 2; - final static int PRESET_DICT = 0x20; - - final static int DEFAULT_MEM_LEVEL = 8; - - final static int MAX_MATCH = 258; - final static int MIN_MATCH = 3; - - final static int MAX_WBITS = 15; - final static int WSIZE = 1 << MAX_WBITS; - final static int WMASK = WSIZE - 1; - - final static int HASH_BITS = DEFAULT_MEM_LEVEL + 7; - final static int HASH_SIZE = 1 << HASH_BITS; - final static int HASH_MASK = HASH_SIZE - 1; - final static int HASH_SHIFT = (HASH_BITS + MIN_MATCH - 1) / MIN_MATCH; - - final static int MIN_LOOKAHEAD = MAX_MATCH + MIN_MATCH + 1; - final static int MAX_DIST = WSIZE - MIN_LOOKAHEAD; - - final static int PENDING_BUF_SIZE = 1 << (DEFAULT_MEM_LEVEL + 8); - final static int MAX_BLOCK_SIZE = Math.min(65535, PENDING_BUF_SIZE-5); - - final static int DEFLATE_STORED = 0; - final static int DEFLATE_FAST = 1; - final static int DEFLATE_SLOW = 2; - - final static int GOOD_LENGTH[] = { 0,4, 4, 4, 4, 8, 8, 8, 32, 32 }; - final static int MAX_LAZY[] = { 0,4, 5, 6, 4,16, 16, 32, 128, 258 }; - final static int NICE_LENGTH[] = { 0,8,16,32,16,32,128,128, 258, 258 }; - final static int MAX_CHAIN[] = { 0,4, 8,32,16,32,128,256,1024,4096 }; - final static int COMPR_FUNC[] = { 0,1, 1, 1, 1, 2, 2, 2, 2, 2 }; +interface DeflaterConstants +{ + boolean DEBUGGING = false; + + int STORED_BLOCK = 0; + int STATIC_TREES = 1; + int DYN_TREES = 2; + int PRESET_DICT = 0x20; + + int DEFAULT_MEM_LEVEL = 8; + + int MAX_MATCH = 258; + int MIN_MATCH = 3; + + int MAX_WBITS = 15; + int WSIZE = 1 << MAX_WBITS; + int WMASK = WSIZE - 1; + + int HASH_BITS = DEFAULT_MEM_LEVEL + 7; + int HASH_SIZE = 1 << HASH_BITS; + int HASH_MASK = HASH_SIZE - 1; + int HASH_SHIFT = (HASH_BITS + MIN_MATCH - 1) / MIN_MATCH; + + int MIN_LOOKAHEAD = MAX_MATCH + MIN_MATCH + 1; + int MAX_DIST = WSIZE - MIN_LOOKAHEAD; + + int PENDING_BUF_SIZE = 1 << (DEFAULT_MEM_LEVEL + 8); + int MAX_BLOCK_SIZE = Math.min(65535, PENDING_BUF_SIZE-5); + + int DEFLATE_STORED = 0; + int DEFLATE_FAST = 1; + int DEFLATE_SLOW = 2; + + int GOOD_LENGTH[] = { 0,4, 4, 4, 4, 8, 8, 8, 32, 32 }; + int MAX_LAZY[] = { 0,4, 5, 6, 4,16, 16, 32, 128, 258 }; + int NICE_LENGTH[] = { 0,8,16,32,16,32,128,128, 258, 258 }; + int MAX_CHAIN[] = { 0,4, 8,32,16,32,128,256,1024,4096 }; + int COMPR_FUNC[] = { 0,1, 1, 1, 1, 2, 2, 2, 2, 2 }; } Index: java/util/zip/DeflaterEngine.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/zip/DeflaterEngine.java,v retrieving revision 1.6 diff -u -r1.6 DeflaterEngine.java --- java/util/zip/DeflaterEngine.java 29 Apr 2004 15:47:26 -0000 1.6 +++ java/util/zip/DeflaterEngine.java 22 Oct 2004 17:52:31 -0000 @@ -1,5 +1,5 @@ -/* java.util.zip.DeflaterEngine - Copyright (C) 2001 Free Software Foundation, Inc. +/* DeflaterEngine.java -- + Copyright (C) 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,8 +37,9 @@ package java.util.zip; -class DeflaterEngine implements DeflaterConstants { - private final static int TOO_FAR = 4096; +class DeflaterEngine implements DeflaterConstants +{ + private static final int TOO_FAR = 4096; private int ins_h; @@ -220,7 +221,7 @@ } } - private final void updateHash() { + private void updateHash() { if (DEBUGGING) System.err.println("updateHash: "+strstart); ins_h = (window[strstart] << HASH_SHIFT) ^ window[strstart + 1]; @@ -230,7 +231,7 @@ * Inserts the current string in the head hash and returns the previous * value for this hash. */ - private final int insertString() { + private int insertString() { short match; int hash = ((ins_h << HASH_SHIFT) ^ window[strstart + (MIN_MATCH -1)]) & HASH_MASK; Index: java/util/zip/DeflaterHuffman.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/zip/DeflaterHuffman.java,v retrieving revision 1.4 diff -u -r1.4 DeflaterHuffman.java --- java/util/zip/DeflaterHuffman.java 23 Apr 2004 20:34:11 -0000 1.4 +++ java/util/zip/DeflaterHuffman.java 22 Oct 2004 17:52:31 -0000 @@ -1,5 +1,5 @@ -/* java.util.zip.DeflaterHuffman - Copyright (C) 2001 Free Software Foundation, Inc. +/* DeflaterHuffman.java -- + Copyright (C) 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -59,7 +59,7 @@ private static final int[] BL_ORDER = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 }; - private final static String bit4Reverse = + private static String bit4Reverse = "\000\010\004\014\002\012\006\016\001\011\005\015\003\013\007\017"; class Tree { @@ -571,7 +571,7 @@ blTree.reset(); } - private final int l_code(int len) { + private int l_code(int len) { if (len == 255) return 285; @@ -584,7 +584,7 @@ return code + len; } - private final int d_code(int distance) { + private int d_code(int distance) { int code = 0; while (distance >= 4) { Index: java/util/zip/GZIPInputStream.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/zip/GZIPInputStream.java,v retrieving revision 1.10 diff -u -r1.10 GZIPInputStream.java --- java/util/zip/GZIPInputStream.java 20 Oct 2004 08:08:52 -0000 1.10 +++ java/util/zip/GZIPInputStream.java 22 Oct 2004 17:52:31 -0000 @@ -198,14 +198,11 @@ eos = true; return; } + int magic2 = in.read(); + if ((magic + (magic2 << 8)) != GZIP_MAGIC) + throw new IOException("Error in GZIP header, bad magic code"); headCRC.update(magic); - if (magic != (GZIP_MAGIC & 0xff)) - throw new IOException("Error in GZIP header, second byte doesn't match"); - - magic = in.read(); - if (magic != (GZIP_MAGIC >> 8)) - throw new IOException("Error in GZIP header, first byte doesn't match"); - headCRC.update(magic); + headCRC.update(magic2); /* 2. Check the compression type (must be 8) */ int CM = in.read(); Index: java/util/zip/InflaterHuffmanTree.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/zip/InflaterHuffmanTree.java,v retrieving revision 1.3 diff -u -r1.3 InflaterHuffmanTree.java --- java/util/zip/InflaterHuffmanTree.java 22 Jan 2002 22:27:02 -0000 1.3 +++ java/util/zip/InflaterHuffmanTree.java 22 Oct 2004 17:52:31 -0000 @@ -1,5 +1,5 @@ -/* java.util.zip.InflaterHuffmanTree - Copyright (C) 2001 Free Software Foundation, Inc. +/* InflaterHuffmanTree.java -- + Copyright (C) 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,8 +37,10 @@ package java.util.zip; -public class InflaterHuffmanTree { - private final static int MAX_BITLEN = 15; +public class InflaterHuffmanTree +{ + private static final int MAX_BITLEN = 15; + private short[] tree; public static InflaterHuffmanTree defLitLenTree, defDistTree; Index: java/util/zip/OutputWindow.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/zip/OutputWindow.java,v retrieving revision 1.4 diff -u -r1.4 OutputWindow.java --- java/util/zip/OutputWindow.java 15 Jul 2004 13:35:30 -0000 1.4 +++ java/util/zip/OutputWindow.java 22 Oct 2004 17:52:31 -0000 @@ -1,5 +1,5 @@ -/* java.util.zip.OutputWindow - Copyright (C) 2001 Free Software Foundation, Inc. +/* OutputWindow.java -- + Copyright (C) 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -63,8 +63,7 @@ window_end &= WINDOW_MASK; } - - private final void slowRepeat(int rep_start, int len, int dist) + private void slowRepeat(int rep_start, int len, int dist) { while (len-- > 0) { Index: java/util/zip/ZipEntry.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/zip/ZipEntry.java,v retrieving revision 1.13 diff -u -r1.13 ZipEntry.java --- java/util/zip/ZipEntry.java 11 Oct 2004 13:11:57 -0000 1.13 +++ java/util/zip/ZipEntry.java 22 Oct 2004 17:52:31 -0000 @@ -1,4 +1,4 @@ -/* java.util.zip.ZipEntry +/* ZipEntry.java -- Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -71,15 +71,14 @@ int flags; /* used by ZipOutputStream */ int offset; /* used by ZipFile and ZipOutputStream */ - /** * Compression method. This method doesn't compress at all. */ - public final static int STORED = 0; + public static final int STORED = 0; /** * Compression method. This method uses the Deflater. */ - public final static int DEFLATED = 8; + public static final int DEFLATED = 8; /** * Creates a zip entry with the given name. Index: java/util/zip/ZipFile.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/zip/ZipFile.java,v retrieving revision 1.18 diff -u -r1.18 ZipFile.java --- java/util/zip/ZipFile.java 21 Oct 2004 21:07:15 -0000 1.18 +++ java/util/zip/ZipFile.java 22 Oct 2004 17:52:31 -0000 @@ -148,7 +148,7 @@ * @exception IOException if a i/o error occured. * @exception EOFException if the file ends prematurely */ - private final int readLeShort(DataInput di, byte[] b) throws IOException + private int readLeShort(DataInput di, byte[] b) throws IOException { di.readFully(b, 0, 2); return (b[0] & 0xff) | (b[1] & 0xff) << 8; @@ -165,14 +165,13 @@ * @exception IOException if a i/o error occured. * @exception EOFException if the file ends prematurely */ - private final int readLeInt(DataInput di, byte[] b) throws IOException + private int readLeInt(DataInput di, byte[] b) throws IOException { di.readFully(b, 0, 4); return ((b[0] & 0xff) | (b[1] & 0xff) << 8) | ((b[2] & 0xff) | (b[3] & 0xff) << 8) << 16; } - /** * Read an unsigned short in little endian byte order from the given * byte buffer at the given offset. @@ -181,7 +180,7 @@ * @param off the offset to read from. * @return The value read. */ - private final int readLeShort(byte[] b, int off) + private int readLeShort(byte[] b, int off) { return (b[off] & 0xff) | (b[off+1] & 0xff) << 8; } @@ -194,7 +193,7 @@ * @param off the offset to read from. * @return The value read. */ - private final int readLeInt(byte[] b, int off) + private int readLeInt(byte[] b, int off) { return ((b[off] & 0xff) | (b[off+1] & 0xff) << 8) | ((b[off+2] & 0xff) | (b[off+3] & 0xff) << 8) << 16; Index: java/util/zip/ZipInputStream.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/zip/ZipInputStream.java,v retrieving revision 1.13 diff -u -r1.13 ZipInputStream.java --- java/util/zip/ZipInputStream.java 21 Oct 2004 21:07:15 -0000 1.13 +++ java/util/zip/ZipInputStream.java 22 Oct 2004 17:52:31 -0000 @@ -106,7 +106,7 @@ } } - private final int readLeByte() throws IOException + private int readLeByte() throws IOException { if (avail <= 0) { @@ -120,7 +120,7 @@ /** * Read an unsigned short in little endian byte order. */ - private final int readLeShort() throws IOException + private int readLeShort() throws IOException { return readLeByte() | (readLeByte() << 8); } @@ -128,7 +128,7 @@ /** * Read an int in little endian byte order. */ - private final int readLeInt() throws IOException + private int readLeInt() throws IOException { return readLeShort() | (readLeShort() << 16); } Index: java/util/zip/ZipOutputStream.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/zip/ZipOutputStream.java,v retrieving revision 1.8 diff -u -r1.8 ZipOutputStream.java --- java/util/zip/ZipOutputStream.java 21 May 2004 07:54:34 -0000 1.8 +++ java/util/zip/ZipOutputStream.java 22 Oct 2004 17:52:31 -0000 @@ -1,5 +1,5 @@ -/* java.util.zip.ZipOutputStream - Copyright (C) 2001 Free Software Foundation, Inc. +/* ZipOutputStream.java -- + Copyright (C) 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -71,17 +71,18 @@ /** * Our Zip version is hard coded to 1.0 resp. 2.0 */ - private final static int ZIP_STORED_VERSION = 10; - private final static int ZIP_DEFLATED_VERSION = 20; + private static final int ZIP_STORED_VERSION = 10; + private static final int ZIP_DEFLATED_VERSION = 20; /** * Compression method. This method doesn't compress at all. */ - public final static int STORED = 0; + public static final int STORED = 0; + /** * Compression method. This method uses the Deflater. */ - public final static int DEFLATED = 8; + public static final int DEFLATED = 8; /** * Creates a new Zip output stream, writing a zip archive. @@ -136,7 +137,7 @@ /** * Write an unsigned short in little endian byte order. */ - private final void writeLeShort(int value) throws IOException + private void writeLeShort(int value) throws IOException { out.write(value & 0xff); out.write((value >> 8) & 0xff); @@ -145,7 +146,7 @@ /** * Write an int in little endian byte order. */ - private final void writeLeInt(int value) throws IOException + private void writeLeInt(int value) throws IOException { writeLeShort(value); writeLeShort(value >> 16);