diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-09 19:58:05 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-09 19:58:05 +0000 |
| commit | 65bf3316cf384588453604be6b4f0ed3751a8b0f (patch) | |
| tree | 996a5f57d4a68c53473382e45cb22f574cb3e4db /libjava/classpath/java/util/Properties.java | |
| parent | 8fc56618a84446beccd45b80381cdfe0e94050df (diff) | |
| download | ppe42-gcc-65bf3316cf384588453604be6b4f0ed3751a8b0f.tar.gz ppe42-gcc-65bf3316cf384588453604be6b4f0ed3751a8b0f.zip | |
Merged gcj-eclipse branch to trunk.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/java/util/Properties.java')
| -rw-r--r-- | libjava/classpath/java/util/Properties.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libjava/classpath/java/util/Properties.java b/libjava/classpath/java/util/Properties.java index eb208f5a93d..e294fee7ea9 100644 --- a/libjava/classpath/java/util/Properties.java +++ b/libjava/classpath/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, |
