diff options
| author | Michael Koch <konqueror@gmx.de> | 2005-02-21 21:41:28 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2005-02-21 21:41:28 +0000 |
| commit | 11e56db0bd83ae0a2332cc789494482c731f9c98 (patch) | |
| tree | 8dc82cf159a778b3a2ad143079c2b8ecf82b7b33 /libjava | |
| parent | 74421469393fd0fef8ac928150140f0ac64cbaa9 (diff) | |
| download | gcc-11e56db0bd83ae0a2332cc789494482c731f9c98.zip gcc-11e56db0bd83ae0a2332cc789494482c731f9c98.tar.gz gcc-11e56db0bd83ae0a2332cc789494482c731f9c98.tar.bz2 | |
2005-02-21 Michael Koch <konqueror@gmx.de>
* java/awt/Checkbox.java
(next_checkbox_number): New static variable.
(generateName): New method.
(getUniqueLong): Likewise.
* java/awt/Window.java
(next_window_number): New static variable.
(generateName): New method.
(getUniqueLong): Likewise.
From-SVN: r95354
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 11 | ||||
| -rw-r--r-- | libjava/java/awt/Checkbox.java | 24 | ||||
| -rw-r--r-- | libjava/java/awt/Window.java | 20 |
3 files changed, 52 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1c141df..a9025c3 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,14 @@ +2005-02-21 Michael Koch <konqueror@gmx.de> + + * java/awt/Checkbox.java + (next_checkbox_number): New static variable. + (generateName): New method. + (getUniqueLong): Likewise. + * java/awt/Window.java + (next_window_number): New static variable. + (generateName): New method. + (getUniqueLong): Likewise. + 2005-02-21 Mark Wielaard <mark@klomp.org> * java/util/jar/JarFile.java (verifyHashes): Check whether ZipEntry diff --git a/libjava/java/awt/Checkbox.java b/libjava/java/awt/Checkbox.java index b3fc4c2..2a8b62a 100644 --- a/libjava/java/awt/Checkbox.java +++ b/libjava/java/awt/Checkbox.java @@ -1,5 +1,5 @@ /* Checkbox.java -- An AWT checkbox widget - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -95,6 +95,11 @@ private boolean state; // The list of listeners for this object. private transient ItemListener item_listeners; + /* + * The number used to generate the name returned by getName. + */ + private static transient long next_checkbox_number; + /** * This class provides accessibility support for the * checkbox. @@ -106,7 +111,6 @@ protected class AccessibleAWTCheckbox extends AccessibleAWTComponent implements ItemListener, AccessibleAction, AccessibleValue { - /** * Serialization constant to match JDK 1.5 */ @@ -627,4 +631,18 @@ public AccessibleContext getAccessibleContext() return accessibleContext; } -} // class Checkbox + /** + * Generate a unique name for this checkbox. + * + * @return A unique name for this checkbox. + */ + String generateName() + { + return "checkbox" + getUniqueLong(); + } + + private static synchronized long getUniqueLong() + { + return next_checkbox_number++; + } +} diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java index cdcd1a4..0a39d20 100644 --- a/libjava/java/awt/Window.java +++ b/libjava/java/awt/Window.java @@ -92,6 +92,11 @@ public class Window extends Container implements Accessible private transient Component windowFocusOwner; + /* + * The number used to generate the name returned by getName. + */ + private static transient long next_window_number; + protected class AccessibleAWTWindow extends AccessibleAWTContainer { public AccessibleRole getAccessibleRole() @@ -945,4 +950,19 @@ public class Window extends Container implements Accessible getToolkit().getSystemEventQueue().postEvent(ce); } } + + /** + * Generate a unique name for this window. + * + * @return A unique name for this window. + */ + String generateName() + { + return "win" + getUniqueLong(); + } + + private static synchronized long getUniqueLong() + { + return next_window_number++; + } } |