summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2005-09-27 16:49:38 +0000
committerTom Tromey <tromey@redhat.com>2005-09-27 16:49:38 +0000
commitfe2e9904637dcbb475103acd01ea6455bb6a251b (patch)
treef5761b1e56a8fefe4d5a19a9022dbc128bd718f0
parentd3aac87afbb1f8e9772e511957d82bcf74f75175 (diff)
downloadclasspath-fe2e9904637dcbb475103acd01ea6455bb6a251b.tar.gz
* java/awt/im/InputMethodHighlight.java (InputMethodHighlight):
Updated argument types. (getStyle): Updated return type. * java/awt/MenuBar.java (shortcuts): Updated return type. * java/awt/Window.java (hide): Now deprecated. (show): Likewise.
-rw-r--r--ChangeLog9
-rw-r--r--java/awt/MenuBar.java4
-rw-r--r--java/awt/Window.java8
-rw-r--r--java/awt/im/InputMethodHighlight.java7
4 files changed, 22 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index fbebadc1a..be9bf9387 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2005-09-27 Tom Tromey <tromey@redhat.com>
+ * java/awt/im/InputMethodHighlight.java (InputMethodHighlight):
+ Updated argument types.
+ (getStyle): Updated return type.
+ * java/awt/MenuBar.java (shortcuts): Updated return type.
+ * java/awt/Window.java (hide): Now deprecated.
+ (show): Likewise.
+
+2005-09-27 Tom Tromey <tromey@redhat.com>
+
* java/lang/String.java (CASE_INSENSITIVE_ORDER): Now a
Comparator<String>.
(CaseInsensitiveComparator): Updated.
diff --git a/java/awt/MenuBar.java b/java/awt/MenuBar.java
index 4089fe189..97156aefe 100644
--- a/java/awt/MenuBar.java
+++ b/java/awt/MenuBar.java
@@ -313,10 +313,10 @@ removeNotify()
*
* @return A list of all shortcuts for the menus in this menu bar.
*/
-public synchronized Enumeration
+public synchronized Enumeration<MenuShortcut>
shortcuts()
{
- Vector shortcuts = new Vector();
+ Vector<MenuShortcut> shortcuts = new Vector<MenuShortcut>();
Enumeration e = menus.elements();
while (e.hasMoreElements())
diff --git a/java/awt/Window.java b/java/awt/Window.java
index 53c54d2c0..1560c861e 100644
--- a/java/awt/Window.java
+++ b/java/awt/Window.java
@@ -1,5 +1,5 @@
/* Window.java --
- Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation
+ Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation
This file is part of GNU Classpath.
@@ -277,7 +277,9 @@ public class Window extends Container implements Accessible
/**
* Shows on-screen this window and any of its owned windows for whom
* isVisible returns true.
+ * @specnote: Deprecated starting in 1.5.
*/
+ @Deprecated
public void show()
{
if (parent != null && !parent.isDisplayable())
@@ -327,6 +329,10 @@ public class Window extends Container implements Accessible
}
}
+ /**
+ * @specnote: Deprecated starting in 1.5.
+ */
+ @Deprecated
public void hide()
{
// Hide visible owned windows.
diff --git a/java/awt/im/InputMethodHighlight.java b/java/awt/im/InputMethodHighlight.java
index 0d664b193..0eafe9c5f 100644
--- a/java/awt/im/InputMethodHighlight.java
+++ b/java/awt/im/InputMethodHighlight.java
@@ -38,6 +38,7 @@ exception statement from your version. */
package java.awt.im;
import java.util.Map;
+import java.awt.font.TextAttribute;
/**
* This describes the highlight attributes of text composed in an input method.
@@ -92,7 +93,7 @@ public class InputMethodHighlight
private final int variation;
/** The unmodifiable map of rendering styles. */
- private final Map style;
+ private final Map<TextAttribute, ?> style;
/**
* Create an input method highlight style, with variation 0 and null style
@@ -131,7 +132,7 @@ public class InputMethodHighlight
* @since 1.3
*/
public InputMethodHighlight(boolean selected, int state, int variation,
- Map style)
+ Map<TextAttribute, ?> style)
{
if (state != RAW_TEXT && state != CONVERTED_TEXT)
throw new IllegalArgumentException();
@@ -178,7 +179,7 @@ public class InputMethodHighlight
* @return the style map
* @since 1.3
*/
- public Map getStyle()
+ public Map<TextAttribute, ?> getStyle()
{
return style;
}