31e632d3e4
2004-04-09 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkPanelPeer.java (connectSignals): Remove method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c: Remove unused code. 2004-04-02 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/ImageIcon.java: (ImageIcon(file)): set description of the icon to the file name * javax/swing/JCheckBoxMenuItem.java: Mostly Implemented. Work in progress. * javax/swing/JRadioButtonMenuItem.java: Reimplement constructors to use JToggleButtonModel. * javax/swing/plaf/basic/BasicIconFactory.java: (getCheckBoxMenuItemIcon): return check box icon. * javax/swing/plaf/basic/BasicMenuItemUI.java: paint menu item selected only when it is armed and pressed. 2004-04-02 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkMenuItemPeer.java (GtkMenuItemPeer): Only connect signals if this isn't a Menu peer. * java/awt/Component.java (add): Set the parent of the popup as this component. * java/awt/PopupMenu.java (addNotify): Create popup menu when peer is null. (show): Call addNotify() if peer is null. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c (Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show): Set the button argument for gtk_menu_popup() as zero. This causes the popup menu to respond to any mouse button. 2004-03-31 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/JRadioButtonMenuItem.java: Implemented. * javax/swing/plaf/basic/BasicIconFactory.java: (getRadioButtonMenuItemIcon): Return radio button icon. * javax/swing/plaf/basic/BasicMenuItemUI.java: (getPreferredSize): Add size of checkIcon if it exists. (installDefaults): Don't initialize checkIcon. It's value will be set in subclasses. (uninstallDefaults): remove uninstallation of checkIcon. (paint): Moved code to paintMenuItem(). (paintMenuItem): Implemented. * javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java: UI delegate for JRadioButtonMenuItem. 2004-03-29 Olga Rodimina <rodimina@redhat.com> * javax/swing/plaf/basic/BasicMenuItemUI.java: Corrected position of the accelerator. 2004-03-29 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/JMenuItem.java: Partly implemented. Work in progress * javax/swing/plaf/basic/BasicLookAndFeel.java: Changed default value of acceleratorDelimiter. * javax/swing/plaf/basic/BasicMenuItemUI.java: New class. Partly implemented. 2004-03-26 Mark Wielaard <mark@klomp.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c (item_activate): Declare label before use. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkSetFont): Removed unused variable label. (addExposeFilter): Declare variables before use. (removeExposeFilter): Likewise. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (ok_clicked): Declare str_fileName before use. 2004-03-26 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkMenuPeer.java (addSeparator): Remove. * java/awt/Menu.java (separator): Remove static final MenuItem field. (separatorLabel): New static final String field. (addSeparator): Do not use peer method; use add(MenuItem) instead. Use separatorLabel to denote that it is a separator. (insertSeparator): Create a new MenuItem with separatorLabel, instead of reusing the static separator instance, because a MenuItem instance can't be added more than once without being cloned. * java/awt/peer/MenuPeer.java (addSeparator): Remove from interface. 2004-03-26 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkMenuItemPeer.java (connectSignals): New native method declaration. (GtkMenuItemPeer): Connect signals if the parent is a Menu. * java/awt/MenuItem.java (getActionCommand): Return the label if the action command is not set. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c (Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu): Use gtk_menu_shell_append(). * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c (item_activate): Fix argument type. (Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create): Do not connect signal here. (Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_connectSignals): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c (Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create): Check if a label is given. Add the menu widget's top-level GtkWindow to the global window group, so it can grab the pointer. (Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addItem): Use gtk_menu_shell_append(). 2004-03-23 Graydon Hoare <graydon@redhat.com> * java/text/AttributedString.java (addAttribute): Fix off-by-one. (getIterator): Likewise. * java/text/AttributedStringIterator.java (getRunLimit): Correct logic. (getRunStart): Likewise. (getAttribute): Fix inequality. (getAttributes): Likewise. * testsuite/libjava.mauve/xfails: Remove AttributedString xfail. 2004-03-23 Kim Ho <kho@redhat.com> * javax/swing/plaf/basic/BasicTabbedPaneUI.java: (calculateSizes): Return real width and height. 2004-03-23 Kim Ho <kho@redhat.com> * javax/swing/plaf/basic/BasicTabbedPaneUI.java (calculateTabRects): Set the selectedRun before trying to rotate tabs. 2004-03-23 Kim Ho <kho@redhat.com> * Makefile.am: New file * Makefile.in: Regenerate * java/awt/Graphics.java: (drawRect): Draw to the correct point. * javax/swing/DefaultSingleSelectionModel.java (isSelected): Return true if the selected index is not -1. * javax/swing/JLabel.java: Do not change mnemonic index if text is null. * javax/swing/JProgressBar.java: Use JComponent's EventListenerList. * javax/swing/JScrollBar.java: Ditto. * javax/swing/JSlider.java: Ditto. * javax/swing/JTabbedPane.java: Reimplement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Add defaults for TabbedPane. * javax/swing/plaf/basic/BasicArrowButton.java: Implement * javax/swing/plaf/basic/BasicProgressBarUI.java: (paintDeterminate): Don't paint String if it's empty. (paintIndeterminate): ditto. * javax/swing/plaf/basic/BasicTabbedPaneUI.java: Reimplement. 2004-03-19 Michael Koch <konqueror@gmx.de> * java/awt/image/AffineTransformOp.java (AffineTransformOp): Made public. * javax/swing/JComponent.java (listenerList): Made protected. (accessibleContext): Likewise. * javax/swing/JList.java (valueChanged): Dont use internal fields of ListSelectionEvent. * javax/swing/JViewport.java (getView): Dont use internal fields of Component. (addImpl): Likewise. * javax/swing/Timer.java (isRunning): Made public. (start): Likewise. (stop): Likewise. * javax/swing/UIDefaults.java (getInt): Made public. * javax/swing/plaf/basic/BasicListUI.java (mousePressed): Dont use internal fields of MouseEvent. (propertyChanged): Dont use internal fields of PropertyChangeEvent. * javax/swing/plaf/basic/BasicScrollBarUI.java (arrowIcon): Made static. * javax/swing/plaf/basic/BasicViewportUI.java (stateChanged): Dont use internal field on ChangeEvent. * javax/swing/text/JTextComponent.java (getUI): Call UIManager.getUI(). (updateUI): Use getUI(). 2004-03-19 Graydon Hoare <graydon@redhat.com> * javax/swing/JComponent.java: Turn off double buffer by default. * javax/swing/plaf/basic/BasicViewportUI.java: Clear rects before painting. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable): Use cairo to copy areas. (Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClip): Initialize and set clip region. 2004-03-15 Thomas Fitzsimmons <fitzsim@redhat.com> * java/applet/Applet.java (preferredSize): Override deprecated variant of getPreferredSize. (minimumSize): Override deprecated variant of getMinimumSize. 2004-03-15 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (drawImage(img,xform,bgcolor,obs)): New Method. Helper function that every drawImage method will use. (drawRaster): Added new parameter, bgcolor. All transparent pixels are changed to bgcolor before image is drawn. (drawRenderedImage): Fixed to use changed drawRaster(). (drawImage(image,xform,obs): Fixed to use new helper function (drawImage(image,op,x,y)): Ditto. (drawImage (img,x,y,observer)): Ditto. ((PainterThread) bgcolor): New Field. ((PainterThread) (setPixels)): Changed all transparent pixels to bgcolor. (drawImage(img,x,y,width,height,bgcolor,observer)): Fixed FIXME - all the transparent pixels are changed to the specified bgcolor. (drawImage(img, x, y, width, height, observer): Changed to use function above. (drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,bgcolor,observer)): Fixed FIXME- changed all transparent pixels to bgcolor. (drawImage (img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, observer)): Changed to use function above. 2004-03-14 Thomas Fitzsimmons <fitzsim@redhat.com> * java/applet/Applet.java (dimensions): New field. (getDimensions): New method. (getPreferredSize): Call getDimensions. (getMinimumSize): Likewise. 2004-03-13 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/classpath/jcl.c: Include stdlib.h, not malloc.h. * jni/classpath/jnilink.c: Likewise. * java/applet/Applet.java (getPreferredSize): New method. (getMinimumSize): New method. From-SVN: r80762
474 lines
11 KiB
Java
474 lines
11 KiB
Java
/* MenuItem.java -- An item in a menu
|
|
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package java.awt;
|
|
|
|
import java.awt.event.ActionEvent;
|
|
import java.awt.event.ActionListener;
|
|
import java.awt.peer.MenuItemPeer;
|
|
import java.io.Serializable;
|
|
import java.lang.reflect.Array;
|
|
import java.util.EventListener;
|
|
|
|
/**
|
|
* This class represents an item in a menu.
|
|
*
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
*/
|
|
public class MenuItem extends MenuComponent
|
|
implements Serializable
|
|
{
|
|
|
|
// FIXME: The enabled event mask is not used at this time.
|
|
|
|
/*
|
|
* Static Variables
|
|
*/
|
|
|
|
// Serialization Constant
|
|
private static final long serialVersionUID = -21757335363267194L;
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Instance Variables
|
|
*/
|
|
|
|
/**
|
|
* @serial The name of the action command generated by this item.
|
|
*/
|
|
private String actionCommand;
|
|
|
|
/**
|
|
* @serial Indicates whether or not this menu item is enabled.
|
|
*/
|
|
private boolean enabled;
|
|
|
|
/**
|
|
* @serial The mask of events that are enabled for this menu item.
|
|
*/
|
|
long eventMask;
|
|
|
|
/**
|
|
* @serial This menu item's label
|
|
*/
|
|
private String label;
|
|
|
|
/**
|
|
* @serial The shortcut for this menu item, if any
|
|
*/
|
|
private MenuShortcut shortcut;
|
|
|
|
// The list of action listeners for this menu item.
|
|
private transient ActionListener action_listeners;
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Constructors
|
|
*/
|
|
|
|
/**
|
|
* Initializes a new instance of <code>MenuItem</code> with no label
|
|
* and no shortcut.
|
|
*/
|
|
public
|
|
MenuItem()
|
|
{
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Initializes a new instance of <code>MenuItem</code> with the specified
|
|
* label and no shortcut.
|
|
*
|
|
* @param label The label for this menu item.
|
|
*/
|
|
public
|
|
MenuItem(String label)
|
|
{
|
|
this.label = label;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Initializes a new instance of <code>MenuItem</code> with the specified
|
|
* label and shortcut.
|
|
*
|
|
* @param label The label for this menu item.
|
|
* @param shortcut The shortcut for this menu item.
|
|
*/
|
|
public
|
|
MenuItem(String label, MenuShortcut shortcut)
|
|
{
|
|
this.label = label;
|
|
this.shortcut = shortcut;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Instance Methods
|
|
*/
|
|
|
|
/**
|
|
* Returns the label for this menu item, which may be <code>null</code>.
|
|
*
|
|
* @return The label for this menu item.
|
|
*/
|
|
public String
|
|
getLabel()
|
|
{
|
|
return(label);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* This method sets the label for this menu to the specified value.
|
|
*
|
|
* @param label The new label for this menu item.
|
|
*/
|
|
public synchronized void
|
|
setLabel(String label)
|
|
{
|
|
this.label = label;
|
|
if (peer != null)
|
|
{
|
|
MenuItemPeer mp = (MenuItemPeer) peer;
|
|
mp.setLabel (label);
|
|
}
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Tests whether or not this menu item is enabled.
|
|
*
|
|
* @return <code>true</code> if this menu item is enabled, <code>false</code>
|
|
* otherwise.
|
|
*/
|
|
public boolean
|
|
isEnabled()
|
|
{
|
|
return(enabled);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Sets the enabled status of this menu item.
|
|
*
|
|
* @param enabled <code>true</code> to enable this menu item,
|
|
* <code>false</code> otherwise.
|
|
*/
|
|
public synchronized void
|
|
setEnabled(boolean enabled)
|
|
{
|
|
enable (enabled);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Sets the enabled status of this menu item.
|
|
*
|
|
* @param enabled <code>true</code> to enable this menu item,
|
|
* <code>false</code> otherwise.
|
|
*
|
|
* @deprecated This method is deprecated in favor of <code>setEnabled()</code>.
|
|
*/
|
|
public void
|
|
enable(boolean enabled)
|
|
{
|
|
if (enabled)
|
|
enable ();
|
|
else
|
|
disable ();
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Enables this menu item.
|
|
*
|
|
* @deprecated This method is deprecated in favor of <code>setEnabled()</code>.
|
|
*/
|
|
public void
|
|
enable()
|
|
{
|
|
if (enabled)
|
|
return;
|
|
|
|
this.enabled = true;
|
|
if (peer != null)
|
|
((MenuItemPeer) peer).setEnabled (true);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Disables this menu item.
|
|
*
|
|
* @deprecated This method is deprecated in favor of <code>setEnabled()</code>.
|
|
*/
|
|
public void
|
|
disable()
|
|
{
|
|
if (!enabled)
|
|
return;
|
|
|
|
this.enabled = false;
|
|
if (peer != null)
|
|
((MenuItemPeer) peer).setEnabled (false);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns the shortcut for this menu item, which may be <code>null</code>.
|
|
*
|
|
* @return The shortcut for this menu item.
|
|
*/
|
|
public MenuShortcut
|
|
getShortcut()
|
|
{
|
|
return(shortcut);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Sets the shortcut for this menu item to the specified value. This
|
|
* must be done before the native peer is created.
|
|
*
|
|
* @param shortcut The new shortcut for this menu item.
|
|
*/
|
|
public void
|
|
setShortcut(MenuShortcut shortcut)
|
|
{
|
|
this.shortcut = shortcut;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Deletes the shortcut for this menu item if one exists. This must be
|
|
* done before the native peer is created.
|
|
*/
|
|
public void
|
|
deleteShortcut()
|
|
{
|
|
shortcut = null;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns the name of the action command in the action events
|
|
* generated by this menu item.
|
|
*
|
|
* @return The action command name
|
|
*/
|
|
public String
|
|
getActionCommand()
|
|
{
|
|
if (actionCommand == null)
|
|
return label;
|
|
else
|
|
return actionCommand;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Sets the name of the action command in the action events generated by
|
|
* this menu item.
|
|
*
|
|
* @param actionCommand The new action command name.
|
|
*/
|
|
public void
|
|
setActionCommand(String actionCommand)
|
|
{
|
|
this.actionCommand = actionCommand;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Enables the specified events. This is done automatically when a
|
|
* listener is added and does not normally need to be done by
|
|
* application code.
|
|
*
|
|
* @param events The events to enable, which should be the bit masks
|
|
* from <code>AWTEvent</code>.
|
|
*/
|
|
protected final void
|
|
enableEvents(long events)
|
|
{
|
|
eventMask |= events;
|
|
// TODO: see comment in Component.enableEvents().
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Disables the specified events.
|
|
*
|
|
* @param events The events to enable, which should be the bit masks
|
|
* from <code>AWTEvent</code>.
|
|
*/
|
|
protected final void
|
|
disableEvents(long events)
|
|
{
|
|
eventMask &= ~events;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Creates the native peer for this object.
|
|
*/
|
|
public void
|
|
addNotify()
|
|
{
|
|
if (peer == null)
|
|
peer = getToolkit ().createMenuItem (this);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Adds the specified listener to the list of registered action listeners
|
|
* for this component.
|
|
*
|
|
* @param listener The listener to add.
|
|
*/
|
|
public synchronized void
|
|
addActionListener(ActionListener listener)
|
|
{
|
|
action_listeners = AWTEventMulticaster.add(action_listeners, listener);
|
|
|
|
enableEvents(AWTEvent.ACTION_EVENT_MASK);
|
|
}
|
|
|
|
public synchronized void
|
|
removeActionListener(ActionListener l)
|
|
{
|
|
action_listeners = AWTEventMulticaster.remove(action_listeners, l);
|
|
}
|
|
|
|
public synchronized ActionListener[] getActionListeners()
|
|
{
|
|
return (ActionListener[])
|
|
AWTEventMulticaster.getListeners(action_listeners,
|
|
ActionListener.class);
|
|
}
|
|
|
|
/** Returns all registered EventListers of the given listenerType.
|
|
* listenerType must be a subclass of EventListener, or a
|
|
* ClassClassException is thrown.
|
|
* @since 1.3
|
|
*/
|
|
public EventListener[] getListeners(Class listenerType)
|
|
{
|
|
if (listenerType == ActionListener.class)
|
|
return getActionListeners();
|
|
return (EventListener[]) Array.newInstance(listenerType, 0);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
void
|
|
dispatchEventImpl(AWTEvent e)
|
|
{
|
|
if (e.id <= ActionEvent.ACTION_LAST
|
|
&& e.id >= ActionEvent.ACTION_FIRST
|
|
&& (action_listeners != null
|
|
|| (eventMask & AWTEvent.ACTION_EVENT_MASK) != 0))
|
|
processEvent(e);
|
|
}
|
|
|
|
/**
|
|
* Processes the specified event by calling <code>processActionEvent()</code>
|
|
* if it is an instance of <code>ActionEvent</code>.
|
|
*
|
|
* @param event The event to process.
|
|
*/
|
|
protected void
|
|
processEvent(AWTEvent event)
|
|
{
|
|
if (event instanceof ActionEvent)
|
|
processActionEvent((ActionEvent)event);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Processes the specified event by dispatching it to any registered listeners.
|
|
*
|
|
* @param event The event to process.
|
|
*/
|
|
protected void
|
|
processActionEvent(ActionEvent event)
|
|
{
|
|
if (action_listeners != null)
|
|
action_listeners.actionPerformed(event);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns a debugging string for this object.
|
|
*
|
|
* @return A debugging string for this object.
|
|
*/
|
|
public String
|
|
paramString()
|
|
{
|
|
return ("label=" + label + ",enabled=" + enabled +
|
|
",actionCommand=" + actionCommand + "," + super.paramString());
|
|
}
|
|
|
|
// Accessibility API not yet implemented.
|
|
// public AccessibleContext getAccessibleContext()
|
|
|
|
} // class MenuItem
|