diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-12-10 20:25:39 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-12-10 20:25:39 +0000 |
| commit | da66af5951b18b6f5e8752cbbe11f5f842332a33 (patch) | |
| tree | a28e126d1415e3689be6c7b2c2d061ae51194195 /java/util/Properties.java | |
| parent | ab90923ee693a17e2e0e37b6ba5a84794c9236de (diff) | |
| download | classpath-da66af5951b18b6f5e8752cbbe11f5f842332a33.tar.gz | |
2006-12-10 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of generics-branch to HEAD (woohoo!)
Diffstat (limited to 'java/util/Properties.java')
| -rw-r--r-- | java/util/Properties.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/util/Properties.java b/java/util/Properties.java index eb208f5a9..e294fee7e 100644 --- a/java/util/Properties.java +++ b/java/util/Properties.java @@ -104,7 +104,7 @@ s16=1,3</pre> * @see PropertyResourceBundle * @status updated to 1.4 */ -public class Properties extends Hashtable +public class Properties extends Hashtable<Object, Object> { // WARNING: Properties is a CORE class in the bootstrap cycle. See the // comments in vm/reference/java/lang/Runtime for implications of this fact. @@ -370,6 +370,7 @@ label = Name:\\u0020</pre> * value that are not strings * @deprecated use {@link #store(OutputStream, String)} instead */ + @Deprecated public void save(OutputStream out, String header) { try @@ -489,7 +490,7 @@ label = Name:\\u0020</pre> * * @return an Enumeration of all defined keys */ - public Enumeration propertyNames() + public Enumeration<?> propertyNames() { // We make a new Set that holds all the keys, then return an enumeration // for that. This prevents modifications from ruining the enumeration, |