Imported GNU Classpath 0.90
Imported GNU Classpath 0.90
* scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
* gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
* java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
* java/lang/Math.java: New override file.
* java/lang/Character.java: Merged from Classpath.
(start, end): Now 'int's.
(canonicalName): New field.
(CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
(UnicodeBlock): Added argument.
(of): New overload.
(forName): New method.
Updated unicode blocks.
(sets): Updated.
* sources.am: Regenerated.
* Makefile.in: Likewise.
From-SVN: r111942
This commit is contained in:
Mark Wielaard
parent
27079765d0
commit
8aa540d2f7
1367 changed files with 188789 additions and 22762 deletions
|
|
@ -1,5 +1,6 @@
|
|||
/* MenuBar.java -- An AWT menu bar class
|
||||
Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005, 2006
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
|
|
@ -39,7 +40,6 @@ exception statement from your version. */
|
|||
package java.awt;
|
||||
|
||||
import java.awt.peer.MenuBarPeer;
|
||||
import java.awt.peer.MenuComponentPeer;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Enumeration;
|
||||
|
|
@ -60,364 +60,311 @@ public class MenuBar extends MenuComponent
|
|||
implements MenuContainer, Serializable, Accessible
|
||||
{
|
||||
|
||||
/*
|
||||
* Static Variables
|
||||
*/
|
||||
|
||||
// Serialization Constant
|
||||
private static final long serialVersionUID = -4930327919388951260L;
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/*
|
||||
* Instance Variables
|
||||
*/
|
||||
|
||||
/**
|
||||
* @serial The menu used for providing help information
|
||||
*/
|
||||
private Menu helpMenu;
|
||||
|
||||
/**
|
||||
* @serial The menus contained in this menu bar.
|
||||
*/
|
||||
private Vector menus = new Vector();
|
||||
//Serialization Constant
|
||||
private static final long serialVersionUID = -4930327919388951260L;
|
||||
|
||||
/**
|
||||
* The accessible context for this component.
|
||||
*
|
||||
* @see #getAccessibleContext()
|
||||
* @serial ignored.
|
||||
* @serial The menu used for providing help information
|
||||
*/
|
||||
private transient AccessibleContext accessibleContext;
|
||||
private Menu helpMenu;
|
||||
|
||||
/*************************************************************************/
|
||||
/**
|
||||
* @serial The menus contained in this menu bar.
|
||||
*/
|
||||
private Vector menus = new Vector();
|
||||
|
||||
/*
|
||||
* Constructors
|
||||
*/
|
||||
|
||||
/**
|
||||
* Initializes a new instance of <code>MenuBar</code>.
|
||||
*
|
||||
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
|
||||
*/
|
||||
public
|
||||
MenuBar()
|
||||
{
|
||||
if (GraphicsEnvironment.isHeadless())
|
||||
throw new HeadlessException ();
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/*
|
||||
* Instance Methods
|
||||
*/
|
||||
|
||||
/**
|
||||
* Returns the help menu for this menu bar. This may be <code>null</code>.
|
||||
*
|
||||
* @return The help menu for this menu bar.
|
||||
*/
|
||||
public Menu
|
||||
getHelpMenu()
|
||||
{
|
||||
return(helpMenu);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/**
|
||||
* Sets the help menu for this menu bar.
|
||||
*
|
||||
* @param menu The new help menu for this menu bar.
|
||||
*/
|
||||
public synchronized void
|
||||
setHelpMenu(Menu menu)
|
||||
{
|
||||
if (helpMenu != null)
|
||||
{
|
||||
helpMenu.removeNotify ();
|
||||
helpMenu.parent = null;
|
||||
}
|
||||
helpMenu = menu;
|
||||
|
||||
if (menu.parent != null)
|
||||
menu.parent.remove (menu);
|
||||
menu.parent = this;
|
||||
|
||||
MenuBarPeer peer = (MenuBarPeer) getPeer ();
|
||||
if (peer != null)
|
||||
{
|
||||
menu.addNotify();
|
||||
peer.addHelpMenu (menu);
|
||||
}
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/** Add a menu to this MenuBar. If the menu has already has a
|
||||
* parent, it is first removed from its old parent before being
|
||||
* added.
|
||||
*
|
||||
* @param menu The menu to add.
|
||||
*
|
||||
* @return The menu that was added.
|
||||
*/
|
||||
public synchronized Menu
|
||||
add(Menu menu)
|
||||
{
|
||||
if (menu.parent != null)
|
||||
menu.parent.remove (menu);
|
||||
|
||||
menu.parent = this;
|
||||
menus.addElement(menu);
|
||||
|
||||
if (peer != null)
|
||||
{
|
||||
menu.addNotify();
|
||||
}
|
||||
|
||||
return(menu);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/**
|
||||
* Removes the menu at the specified index.
|
||||
*
|
||||
* @param index The index of the menu to remove from the menu bar.
|
||||
*/
|
||||
public synchronized void
|
||||
remove(int index)
|
||||
{
|
||||
Menu m = (Menu) menus.get (index);
|
||||
menus.remove (index);
|
||||
m.removeNotify ();
|
||||
m.parent = null;
|
||||
|
||||
if (peer != null)
|
||||
{
|
||||
MenuBarPeer mp = (MenuBarPeer) peer;
|
||||
mp.delMenu (index);
|
||||
}
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/**
|
||||
* Removes the specified menu from the menu bar.
|
||||
*
|
||||
* @param menu The menu to remove from the menu bar.
|
||||
*/
|
||||
public void
|
||||
remove(MenuComponent menu)
|
||||
{
|
||||
int index = menus.indexOf(menu);
|
||||
if (index == -1)
|
||||
return;
|
||||
|
||||
remove(index);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/**
|
||||
* Returns the number of elements in this menu bar.
|
||||
*
|
||||
* @return The number of elements in the menu bar.
|
||||
*/
|
||||
public int
|
||||
getMenuCount()
|
||||
{
|
||||
return countMenus ();
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/**
|
||||
* Returns the number of elements in this menu bar.
|
||||
*
|
||||
* @return The number of elements in the menu bar.
|
||||
*
|
||||
* @deprecated This method is deprecated in favor of <code>getMenuCount()</code>.
|
||||
*/
|
||||
public int
|
||||
countMenus()
|
||||
{
|
||||
return menus.size () + (getHelpMenu () == null ? 0 : 1);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/**
|
||||
* Returns the menu at the specified index.
|
||||
*
|
||||
* @param index the index of the menu
|
||||
*
|
||||
* @return The requested menu.
|
||||
*
|
||||
* @exception ArrayIndexOutOfBoundsException If the index is not valid.
|
||||
*/
|
||||
public Menu
|
||||
getMenu(int index)
|
||||
{
|
||||
return((Menu)menus.elementAt(index));
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/**
|
||||
* Creates this object's native peer.
|
||||
*/
|
||||
public void
|
||||
addNotify()
|
||||
{
|
||||
if (getPeer() == null)
|
||||
setPeer((MenuComponentPeer)getToolkit().createMenuBar(this));
|
||||
Enumeration e = menus.elements();
|
||||
while (e.hasMoreElements())
|
||||
/**
|
||||
* Initializes a new instance of <code>MenuBar</code>.
|
||||
*
|
||||
* @throws HeadlessException if GraphicsEnvironment.isHeadless() is true
|
||||
*/
|
||||
public MenuBar()
|
||||
{
|
||||
Menu mi = (Menu)e.nextElement();
|
||||
mi.addNotify();
|
||||
if (GraphicsEnvironment.isHeadless())
|
||||
throw new HeadlessException();
|
||||
}
|
||||
if (helpMenu != null)
|
||||
|
||||
/**
|
||||
* Returns the help menu for this menu bar. This may be <code>null</code>.
|
||||
*
|
||||
* @return the help menu for this menu bar
|
||||
*/
|
||||
public Menu getHelpMenu()
|
||||
{
|
||||
helpMenu.addNotify();
|
||||
((MenuBarPeer) peer).addHelpMenu(helpMenu);
|
||||
return helpMenu;
|
||||
}
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/**
|
||||
* Destroys this object's native peer.
|
||||
*/
|
||||
public void
|
||||
removeNotify()
|
||||
{
|
||||
Enumeration e = menus.elements();
|
||||
while (e.hasMoreElements())
|
||||
/**
|
||||
* Sets the help menu for this menu bar.
|
||||
*
|
||||
* @param menu the new help menu for this menu bar
|
||||
*/
|
||||
public synchronized void setHelpMenu(Menu menu)
|
||||
{
|
||||
Menu mi = (Menu) e.nextElement();
|
||||
mi.removeNotify();
|
||||
MenuBarPeer myPeer = (MenuBarPeer) getPeer ();
|
||||
|
||||
if (helpMenu != null)
|
||||
{
|
||||
if (myPeer != null)
|
||||
helpMenu.removeNotify();
|
||||
helpMenu.setParent(null);
|
||||
}
|
||||
helpMenu = menu;
|
||||
|
||||
MenuContainer parent = menu.getParent();
|
||||
if (parent != null)
|
||||
parent.remove(menu);
|
||||
menu.setParent(this);
|
||||
|
||||
if (myPeer != null)
|
||||
{
|
||||
menu.addNotify();
|
||||
myPeer.addHelpMenu(menu);
|
||||
}
|
||||
}
|
||||
super.removeNotify();
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
/**
|
||||
* Add a menu to this MenuBar. If the menu has already has a
|
||||
* parent, it is first removed from its old parent before being
|
||||
* added.
|
||||
*
|
||||
* @param menu the menu to add
|
||||
*
|
||||
* @return the menu that was added
|
||||
*/
|
||||
public synchronized Menu add(Menu menu)
|
||||
{
|
||||
MenuBarPeer myPeer = (MenuBarPeer) getPeer ();
|
||||
|
||||
/**
|
||||
* Returns a list of all shortcuts for the menus in this menu bar.
|
||||
*
|
||||
* @return A list of all shortcuts for the menus in this menu bar.
|
||||
*/
|
||||
public synchronized Enumeration
|
||||
shortcuts()
|
||||
{
|
||||
Vector shortcuts = new Vector();
|
||||
Enumeration e = menus.elements();
|
||||
MenuContainer parent = menu.getParent();
|
||||
if (parent != null)
|
||||
parent.remove(menu);
|
||||
|
||||
while (e.hasMoreElements())
|
||||
{
|
||||
Menu menu = (Menu)e.nextElement();
|
||||
if (menu.getShortcut() != null)
|
||||
shortcuts.addElement(menu.getShortcut());
|
||||
}
|
||||
menus.addElement(menu);
|
||||
menu.setParent(this);
|
||||
|
||||
return(shortcuts.elements());
|
||||
}
|
||||
if (myPeer != null)
|
||||
{
|
||||
menu.addNotify();
|
||||
myPeer.addMenu(menu);
|
||||
}
|
||||
return menu;
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
/**
|
||||
* Removes the menu at the specified index.
|
||||
*
|
||||
* @param index the index of the menu to remove from the menu bar
|
||||
*/
|
||||
public synchronized void remove(int index)
|
||||
{
|
||||
Menu m = (Menu) menus.remove(index);
|
||||
MenuBarPeer mp = (MenuBarPeer) getPeer();
|
||||
|
||||
/**
|
||||
* Returns the menu item for the specified shortcut, or <code>null</code>
|
||||
* if no such item exists.
|
||||
*
|
||||
* @param shortcut The shortcut to return the menu item for.
|
||||
*
|
||||
* @return The menu item for the specified shortcut.
|
||||
*/
|
||||
public MenuItem
|
||||
getShortcutMenuItem(MenuShortcut shortcut)
|
||||
{
|
||||
Enumeration e = menus.elements();
|
||||
if (mp != null)
|
||||
m.removeNotify();
|
||||
|
||||
while (e.hasMoreElements())
|
||||
{
|
||||
Menu menu = (Menu)e.nextElement();
|
||||
MenuShortcut s = menu.getShortcut();
|
||||
if ((s != null) && (s.equals(shortcut)))
|
||||
return(menu);
|
||||
}
|
||||
m.setParent(null);
|
||||
|
||||
return(null);
|
||||
}
|
||||
if (mp != null)
|
||||
mp.delMenu(index);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
/**
|
||||
* Removes the specified menu from the menu bar.
|
||||
*
|
||||
* @param menu the menu to remove from the menu bar
|
||||
*/
|
||||
public void remove(MenuComponent menu)
|
||||
{
|
||||
int index = menus.indexOf(menu);
|
||||
if (index == -1)
|
||||
return;
|
||||
|
||||
/**
|
||||
* Deletes the specified menu shortcut.
|
||||
*
|
||||
* @param shortcut The shortcut to delete.
|
||||
*/
|
||||
public void
|
||||
deleteShortcut(MenuShortcut shortcut)
|
||||
{
|
||||
MenuItem it;
|
||||
// This is a slow implementation, but it probably doesn't matter.
|
||||
while ((it = getShortcutMenuItem (shortcut)) != null)
|
||||
it.deleteShortcut ();
|
||||
}
|
||||
remove(index);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the AccessibleContext associated with this <code>MenuBar</code>.
|
||||
* The context is created, if necessary.
|
||||
*
|
||||
* @return the associated context
|
||||
*/
|
||||
public AccessibleContext getAccessibleContext()
|
||||
{
|
||||
/* Create the context if this is the first request */
|
||||
if (accessibleContext == null)
|
||||
accessibleContext = new AccessibleAWTMenuBar();
|
||||
return accessibleContext;
|
||||
}
|
||||
/**
|
||||
* Returns the number of elements in this menu bar.
|
||||
*
|
||||
* @return the number of elements in the menu bar
|
||||
*/
|
||||
public int getMenuCount()
|
||||
{
|
||||
return countMenus();
|
||||
}
|
||||
|
||||
/**
|
||||
* This class provides accessibility support for AWT menu bars.
|
||||
*
|
||||
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
||||
*/
|
||||
protected class AccessibleAWTMenuBar
|
||||
extends AccessibleAWTMenuComponent
|
||||
{
|
||||
/**
|
||||
* Returns the number of elements in this menu bar.
|
||||
*
|
||||
* @return the number of elements in the menu bar
|
||||
*
|
||||
* @deprecated This method is deprecated in favor of
|
||||
* <code>getMenuCount()</code>.
|
||||
*/
|
||||
public int countMenus()
|
||||
{
|
||||
return menus.size() + (getHelpMenu() == null ? 0 : 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the menu at the specified index.
|
||||
*
|
||||
* @param index the index of the menu
|
||||
*
|
||||
* @return the requested menu
|
||||
*
|
||||
* @throws ArrayIndexOutOfBoundsException if the index is not valid
|
||||
*/
|
||||
public Menu getMenu(int index)
|
||||
{
|
||||
return (Menu) menus.elementAt(index);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates this object's native peer.
|
||||
*/
|
||||
public void addNotify()
|
||||
{
|
||||
MenuBarPeer peer = (MenuBarPeer) getPeer();
|
||||
if (peer == null)
|
||||
{
|
||||
peer = getToolkit().createMenuBar(this);
|
||||
setPeer(peer);
|
||||
}
|
||||
|
||||
Enumeration e = menus.elements();
|
||||
while (e.hasMoreElements())
|
||||
{
|
||||
Menu mi = (Menu)e.nextElement();
|
||||
mi.addNotify();
|
||||
peer.addMenu(mi);
|
||||
}
|
||||
|
||||
if (helpMenu != null)
|
||||
{
|
||||
helpMenu.addNotify();
|
||||
peer.addHelpMenu(helpMenu);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Destroys this object's native peer.
|
||||
*/
|
||||
public void removeNotify()
|
||||
{
|
||||
Enumeration e = menus.elements();
|
||||
while (e.hasMoreElements())
|
||||
{
|
||||
Menu mi = (Menu) e.nextElement();
|
||||
mi.removeNotify();
|
||||
}
|
||||
super.removeNotify();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a list of all shortcuts for the menus in this menu bar.
|
||||
*
|
||||
* @return a list of all shortcuts for the menus in this menu bar
|
||||
*/
|
||||
public synchronized Enumeration shortcuts()
|
||||
{
|
||||
Vector shortcuts = new Vector();
|
||||
Enumeration e = menus.elements();
|
||||
|
||||
while (e.hasMoreElements())
|
||||
{
|
||||
Menu menu = (Menu)e.nextElement();
|
||||
if (menu.getShortcut() != null)
|
||||
shortcuts.addElement(menu.getShortcut());
|
||||
}
|
||||
|
||||
return shortcuts.elements();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the menu item for the specified shortcut, or <code>null</code>
|
||||
* if no such item exists.
|
||||
*
|
||||
* @param shortcut the shortcut to return the menu item for
|
||||
*
|
||||
* @return the menu item for the specified shortcut
|
||||
*/
|
||||
public MenuItem getShortcutMenuItem(MenuShortcut shortcut)
|
||||
{
|
||||
Enumeration e = menus.elements();
|
||||
|
||||
while (e.hasMoreElements())
|
||||
{
|
||||
Menu menu = (Menu) e.nextElement();
|
||||
MenuShortcut s = menu.getShortcut();
|
||||
if ((s != null) && s.equals(shortcut))
|
||||
return menu;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes the specified menu shortcut.
|
||||
*
|
||||
* @param shortcut the shortcut to delete
|
||||
*/
|
||||
public void deleteShortcut(MenuShortcut shortcut)
|
||||
{
|
||||
MenuItem it;
|
||||
// This is a slow implementation, but it probably doesn't matter.
|
||||
while ((it = getShortcutMenuItem (shortcut)) != null)
|
||||
it.deleteShortcut();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the AccessibleContext associated with this <code>MenuBar</code>.
|
||||
* The context is created, if necessary.
|
||||
*
|
||||
* @return the associated context
|
||||
*/
|
||||
public AccessibleContext getAccessibleContext()
|
||||
{
|
||||
// Create the context if this is the first request.
|
||||
if (accessibleContext == null)
|
||||
accessibleContext = new AccessibleAWTMenuBar();
|
||||
return accessibleContext;
|
||||
}
|
||||
|
||||
/**
|
||||
* This class provides accessibility support for AWT menu bars.
|
||||
*
|
||||
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
||||
*/
|
||||
protected class AccessibleAWTMenuBar
|
||||
extends AccessibleAWTMenuComponent
|
||||
{
|
||||
|
||||
/**
|
||||
* Compatible with JDK 1.4.2 revision 5
|
||||
*/
|
||||
private static final long serialVersionUID = -8577604491830083815L;
|
||||
/**
|
||||
* Compatible with JDK 1.4.2 revision 5
|
||||
*/
|
||||
private static final long serialVersionUID = -8577604491830083815L;
|
||||
|
||||
/**
|
||||
* This is the default constructor, which simply calls the default
|
||||
* constructor of the superclass.
|
||||
*/
|
||||
protected AccessibleAWTMenuBar()
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the accessible role relating to the menu bar.
|
||||
*
|
||||
* @return <code>AccessibleRole.MENU_BAR</code>
|
||||
*/
|
||||
public AccessibleRole getAccessibleRole()
|
||||
{
|
||||
return AccessibleRole.MENU_BAR;
|
||||
}
|
||||
|
||||
/**
|
||||
* This is the default constructor, which simply calls the default
|
||||
* constructor of the superclass.
|
||||
*/
|
||||
protected AccessibleAWTMenuBar()
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the accessible role relating to the menu bar.
|
||||
*
|
||||
* @return <code>AccessibleRole.MENU_BAR</code>.
|
||||
*/
|
||||
public AccessibleRole getAccessibleRole()
|
||||
{
|
||||
return AccessibleRole.MENU_BAR;
|
||||
}
|
||||
|
||||
} // class AccessibleAWTMenuBar
|
||||
|
||||
} // class MenuBar
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue