From d8bcd2536ff21bcec0896f20cb2f1249de05da92 Mon Sep 17 00:00:00 2001 From: mark Date: Sat, 6 Nov 2004 16:32:56 +0000 Subject: 2004-11-06 Michael Koch * java/lang/StringBuffer.java, java/lang/Throwable.java, java/security/spec/DSAParameterSpec.java, java/util/zip/ZipEntry.java, java/util/zip/ZipFile.java, java/util/zip/ZipInputStream.java, java/util/zip/ZipOutputStream.java: Removed redundant and reordered modifiers. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90177 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/util/zip/ZipFile.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libjava/java/util/zip/ZipFile.java') diff --git a/libjava/java/util/zip/ZipFile.java b/libjava/java/util/zip/ZipFile.java index 1f9ab5ed5ee..c95a34d6b4e 100644 --- a/libjava/java/util/zip/ZipFile.java +++ b/libjava/java/util/zip/ZipFile.java @@ -148,7 +148,7 @@ public class ZipFile implements ZipConstants * @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 @@ public class ZipFile implements ZipConstants * @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 @@ public class ZipFile implements ZipConstants * @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 @@ public class ZipFile implements ZipConstants * @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; -- cgit v1.2.3