FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged gcj-eclipse branch to trunk.

Browse source 
From-SVN: r120621
This commit is contained in:
Tom Tromey 2007-01-09 19:58:05 +00:00
parent c648dedbde
commit 97b8365caf
17478 changed files with 606493 additions and 100744 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libjava/classpath/java/util/jar/Attributes.java
View file

@ -67,8 +67,8 @@ import java.util.Set;
* @see java.util.jar.Attributes.Name
* @author Mark Wielaard (mark@klomp.org)
*/
public class Attributes
implements Cloneable, java.util.Map // Fully qualified for jikes 1.22
public class Attributes
implements Cloneable, Map<Object, Object>
{
// Fields
@ -78,7 +78,7 @@ public class Attributes
* implementation it is actually a Hashtable, but that can be different in
* other implementations.
*/
protected Map map;
protected Map<Object, Object> map;
// Inner class
@ -492,7 +492,7 @@ public class Attributes
*
* @return a set of attribute name value pairs
*/
public Set entrySet()
public Set<Map.Entry<Object, Object>> entrySet()
{
return map.entrySet();
}
@ -558,7 +558,7 @@ public class Attributes
/**
* Gives a Set of all the values of defined attribute names.
*/
public Set keySet()
public Set<Object> keySet()
{
return map.keySet();
}
@ -587,7 +587,7 @@ public class Attributes
* @exception ClassCastException if the supplied map is not an instance of
* Attributes
*/
public void putAll(Map attr)
public void putAll(Map<?, ?> attr)
{
if (!(attr instanceof Attributes))
{
@ -622,7 +622,7 @@ public class Attributes
* Returns all the values of the defined attribute name/value pairs as a
* Collection.
*/
public Collection values()
public Collection<Object> values()
{
return map.values();
}