summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2006-03-03 22:14:34 +0000
committerTom Tromey <tromey@redhat.com>2006-03-03 22:14:34 +0000
commitcb35a91377f1dc2d7b1b5bc4c70ab91cbb36506f (patch)
tree0f5407f9eed7de3c53e91d55d4c9901ee79ec991
parent2100fe4c02f229002ad7bdb563519f618d5397fe (diff)
downloadclasspath-cb35a91377f1dc2d7b1b5bc4c70ab91cbb36506f.tar.gz
* java/awt/MenuBar.java (shortcuts): Genericized.
-rw-r--r--ChangeLog4
-rw-r--r--java/awt/MenuBar.java2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bf4a8cf81..d48e93ddd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2006-03-03 Tom Tromey <tromey@redhat.com>
+ * java/awt/MenuBar.java (shortcuts): Genericized.
+
+2006-03-03 Tom Tromey <tromey@redhat.com>
+
* java/beans/EventSetDescriptor.java (EventSetDescriptor):
Genericized.
(getListenerType): Likewise.
diff --git a/java/awt/MenuBar.java b/java/awt/MenuBar.java
index 3c6b91564..3cf708cd5 100644
--- a/java/awt/MenuBar.java
+++ b/java/awt/MenuBar.java
@@ -267,7 +267,7 @@ public class MenuBar extends MenuComponent
*
* @return a list of all shortcuts for the menus in this menu bar
*/
- public synchronized Enumeration shortcuts()
+ public synchronized Enumeration<MenuShortcut> shortcuts()
{
Vector shortcuts = new Vector();
Enumeration e = menus.elements();