Skip to content

R
riscv-gcc-1
Commit 9440ae0c by Michael Koch Committed by Michael Koch
Options

Map.java, [...]: Removed redundant modifiers. 

2003-10-11  Michael Koch  <konqueror@gmx.de>

	* java/util/Map.java,
	java/util/Observer.java,
	java/util/zip/Checksum.java,
	java/util/zip/ZipConstants.java:
	Removed redundant modifiers.

From-SVN: r72358
parent af6b79a6
Showing with 87 additions and 79 deletions
libjava/ChangeLog
2003-10-11 Michael Koch <konqueror@gmx.de>
* java/util/Map.java,
java/util/Observer.java,
java/util/zip/Checksum.java,
java/util/zip/ZipConstants.java:
Removed redundant modifiers.
2003-10-11 Michael Koch <konqueror@gmx.de>
* java/text/AttributedCharacterIterator.java,
java/text/CharacterIterator.java:
Removed redundant modifiers.
......
libjava/java/util/Map.java
......@@ -85,7 +85,7 @@ public interface Map
*
* @throws UnsupportedOperationException if clear is not supported
*/
public void clear();
void clear();
/**
* Returns true if this contains a mapping for the given key.
......@@ -96,7 +96,7 @@ public interface Map
* @throws NullPointerException if key is <code>null</code> but the map
* does not permit null keys
*/
public boolean containsKey(Object key);
boolean containsKey(Object key);
/**
* Returns true if this contains at least one mapping with the given value.
......@@ -107,7 +107,7 @@ public interface Map
* @param value the value to search for
* @return true if the map contains the value
*/
public boolean containsValue(Object value);
boolean containsValue(Object value);
/**
* Returns a set view of the mappings in this Map. Each element in the
......@@ -123,7 +123,7 @@ public interface Map
* @return the set view of all mapping entries
* @see Map.Entry
*/
public Set entrySet();
Set entrySet();
/**
* Compares the specified object with this map for equality. Returns
......@@ -136,7 +136,7 @@ public interface Map
* @return true if the object equals this map
* @see Set#equals(Object)
*/
public boolean equals(Object o);
boolean equals(Object o);
/**
* Returns the value mapped by the given key. Returns <code>null</code> if
......@@ -149,7 +149,7 @@ public interface Map
* @throws NullPointerException if this map does not accept null keys
* @see #containsKey(Object)
*/
public Object get(Object key);
Object get(Object key);
/**
* Associates the given key to the given value (optional operation). If the
......@@ -167,7 +167,7 @@ public interface Map
* @throws NullPointerException if the map forbids null keys or values
* @see #containsKey(Object)
*/
public Object put(Object key, Object value);
Object put(Object key, Object value);
/**
* Returns the hash code for this map. This is the sum of all hashcodes
......@@ -178,14 +178,14 @@ public interface Map
* @return the hash code
* @see Map.Entry#hashCode()
*/
public int hashCode();
int hashCode();
/**
* Returns true if the map contains no mappings.
*
* @return true if the map is empty
*/
public boolean isEmpty();
boolean isEmpty();
/**
* Returns a set view of the keys in this Map. The set is backed by the
......@@ -199,7 +199,7 @@ public interface Map
*
* @return the set view of all keys
*/
public Set keySet();
Set keySet();
/**
* Copies all entries of the given map to this one (optional operation). If
......@@ -214,7 +214,7 @@ public interface Map
* if <code>m</code> is null.
* @see #put(Object, Object)
*/
public void putAll(Map m);
void putAll(Map m);
/**
* Removes the mapping for this key if present (optional operation). If
......@@ -225,7 +225,7 @@ public interface Map
* @return the value the key mapped to, or null if not present
* @throws UnsupportedOperationException if deletion is unsupported
*/
public Object remove(Object o);
Object remove(Object o);
/**
* Returns the number of key-value mappings in the map. If there are more
......@@ -233,7 +233,7 @@ public interface Map
*
* @return the number of mappings
*/
public int size();
int size();
/**
* Returns a collection (or bag) view of the values in this Map. The
......@@ -248,7 +248,7 @@ public interface Map
*
* @return the collection view of all values
*/
public Collection values();
Collection values();
/**
* A map entry (key-value pair). The Map.entrySet() method returns a set
......@@ -264,14 +264,14 @@ public interface Map
* @since 1.2
* @status updated to 1.4
*/
public static interface Entry
static interface Entry
{
/**
* Get the key corresponding to this entry.
*
* @return the key
*/
public Object getKey();
Object getKey();
/**
* Get the value corresponding to this entry. If you already called
......@@ -279,7 +279,7 @@ public interface Map
*
* @return the value
*/
public Object getValue();
Object getValue();
/**
* Replaces the value with the specified object (optional operation).
......@@ -294,7 +294,7 @@ public interface Map
* prevents it from existing in this map
* @throws NullPointerException if the map forbids null values
*/
public Object setValue(Object value);
Object setValue(Object value);
/**
......@@ -307,7 +307,7 @@ public interface Map
*
* @return the hash code
*/
public int hashCode();
int hashCode();
/**
* Compares the specified object with this entry. Returns true only if
......@@ -324,6 +324,6 @@ public interface Map
*
* @return <code>true</code> if it is equal
*/
public boolean equals(Object o);
boolean equals(Object o);
}
}
libjava/java/util/Observer.java
......@@ -56,5 +56,5 @@ public interface Observer
* @param observable the Observable object that changed
* @param arg arbitrary information, usually relating to the change
*/
public void update(Observable observable, Object arg);
void update(Observable observable, Object arg);
}
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);
}
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;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment