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
This commit is contained in:
Michael Koch 2005-02-21 21:41:28 +00:00 committed by Michael Koch
parent 7442146939
commit 11e56db0bd
3 changed files with 52 additions and 3 deletions

View File

@ -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

View File

@ -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++;
}
}

View File

@ -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++;
}
}