From 9440ae0c09ae192b8a304509937aae237870805a Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sat, 11 Oct 2003 18:52:31 +0000 Subject: Map.java, [...]: Removed redundant modifiers. 2003-10-11 Michael Koch * java/util/Map.java, java/util/Observer.java, java/util/zip/Checksum.java, java/util/zip/ZipConstants.java: Removed redundant modifiers. From-SVN: r72358 --- libjava/java/util/zip/Checksum.java | 8 +-- libjava/java/util/zip/ZipConstants.java | 108 ++++++++++++++++---------------- 2 files changed, 58 insertions(+), 58 deletions(-) (limited to 'libjava/java/util/zip') diff --git a/libjava/java/util/zip/Checksum.java b/libjava/java/util/zip/Checksum.java index f018de4..3b01f97 100644 --- a/libjava/java/util/zip/Checksum.java +++ b/libjava/java/util/zip/Checksum.java @@ -61,19 +61,19 @@ public interface Checksum /** * Returns the data checksum computed so far. */ - public long getValue (); + long getValue(); /** * Resets the data checksum as if no update was ever called. */ - public void reset (); + void reset(); /** * Adds one byte to the data checksum. * * @param bval the data value to add. The high byte of the int is ignored. */ - public void update (int bval); + void update (int bval); /** * Adds the byte array to the data checksum. @@ -82,5 +82,5 @@ public interface Checksum * @param off the offset in the buffer where the data starts * @param len the length of the data */ - public void update (byte[] buf, int off, int len); + void update (byte[] buf, int off, int len); } diff --git a/libjava/java/util/zip/ZipConstants.java b/libjava/java/util/zip/ZipConstants.java index 3d6b744..a934e90 100644 --- a/libjava/java/util/zip/ZipConstants.java +++ b/libjava/java/util/zip/ZipConstants.java @@ -39,59 +39,59 @@ package java.util.zip; interface ZipConstants { - /* The local file header */ - public final static int LOCHDR = 30; - public final static int LOCSIG = 'P'|('K'<<8)|(3<<16)|(4<<24); - - public final static int LOCVER = 4; - public final static int LOCFLG = 6; - public final static int LOCHOW = 8; - public final static int LOCTIM = 10; - public final static int LOCCRC = 14; - public final static int LOCSIZ = 18; - public final static int LOCLEN = 22; - public final static int LOCNAM = 26; - public final static int LOCEXT = 28; - - /* The Data descriptor */ - public final static int EXTSIG = 'P'|('K'<<8)|(7<<16)|(8<<24); - public final static int EXTHDR = 16; - - public final static int EXTCRC = 4; - public final static int EXTSIZ = 8; - public final static int EXTLEN = 12; - - /* The central directory file header */ - public final static int CENSIG = 'P'|('K'<<8)|(1<<16)|(2<<24); - public final static int CENHDR = 46; - - public final static int CENVEM = 4; - public final static int CENVER = 6; - public final static int CENFLG = 8; - public final static int CENHOW = 10; - public final static int CENTIM = 12; - public final static int CENCRC = 16; - public final static int CENSIZ = 20; - public final static int CENLEN = 24; - public final static int CENNAM = 28; - public final static int CENEXT = 30; - public final static int CENCOM = 32; - public final static int CENDSK = 34; - public final static int CENATT = 36; - public final static int CENATX = 38; - public final static int CENOFF = 42; - - /* The entries in the end of central directory */ - public final static int ENDSIG = 'P'|('K'<<8)|(5<<16)|(6<<24); - public final static int ENDHDR = 22; - - /* The following two fields are missing in SUN JDK */ - final static int ENDNRD = 4; - final static int ENDDCD = 6; - public final static int ENDSUB = 8; - public final static int ENDTOT = 10; - public final static int ENDSIZ = 12; - public final static int ENDOFF = 16; - public final static int ENDCOM = 20; + /* The local file header */ + int LOCHDR = 30; + int LOCSIG = 'P'|('K'<<8)|(3<<16)|(4<<24); + + int LOCVER = 4; + int LOCFLG = 6; + int LOCHOW = 8; + int LOCTIM = 10; + int LOCCRC = 14; + int LOCSIZ = 18; + int LOCLEN = 22; + int LOCNAM = 26; + int LOCEXT = 28; + + /* The Data descriptor */ + int EXTSIG = 'P'|('K'<<8)|(7<<16)|(8<<24); + int EXTHDR = 16; + + int EXTCRC = 4; + int EXTSIZ = 8; + int EXTLEN = 12; + + /* The central directory file header */ + int CENSIG = 'P'|('K'<<8)|(1<<16)|(2<<24); + int CENHDR = 46; + + int CENVEM = 4; + int CENVER = 6; + int CENFLG = 8; + int CENHOW = 10; + int CENTIM = 12; + int CENCRC = 16; + int CENSIZ = 20; + int CENLEN = 24; + int CENNAM = 28; + int CENEXT = 30; + int CENCOM = 32; + int CENDSK = 34; + int CENATT = 36; + int CENATX = 38; + int CENOFF = 42; + + /* The entries in the end of central directory */ + int ENDSIG = 'P'|('K'<<8)|(5<<16)|(6<<24); + int ENDHDR = 22; + + /* The following two fields are missing in SUN JDK */ + int ENDNRD = 4; + int ENDDCD = 6; + int ENDSUB = 8; + int ENDTOT = 10; + int ENDSIZ = 12; + int ENDOFF = 16; + int ENDCOM = 20; } -- cgit v1.1