2005-09-06 Lillian Angel <[EMAIL PROTECTED]>
* javax/swing/plaf/basic/BasicMenuItemUI.java:
Formatted class.
On Tue, 2005-09-06 at 12:25 -0400, Lillian Angel wrote:
> 2005-09-06 Lillian Angel <[EMAIL PROTECTED]>
>
> * javax/swing/plaf/basic/BasicMenuItemUI.java:
> Fixes Bug #PR23527
> (paintMenuItem): Moved view rectangle over to the
> left the same amount as defaultTextIconGap so the
> accelerator is painted with some space on the right.
>
Index: javax/swing/plaf/basic/BasicMenuItemUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java,v
retrieving revision 1.22
retrieving revision 1.21
diff -u -r1.22 -r1.21
--- javax/swing/plaf/basic/BasicMenuItemUI.java 6 Sep 2005 16:22:02 -0000 1.22
+++ javax/swing/plaf/basic/BasicMenuItemUI.java 31 Aug 2005 15:23:10 -0000 1.21
@@ -1,39 +1,39 @@
/* BasicMenuItemUI.java --
- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
- This file is part of GNU Classpath.
+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., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 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. */
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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 javax.swing.plaf.basic;
@@ -178,9 +178,9 @@
/**
* Create MenuDragMouseListener to listen for mouse dragged events.
- *
- * @param c
- * menu item to listen to
+ *
+ * @param c menu item to listen to
+ *
* @return The MenuDragMouseListener
*/
protected MenuDragMouseListener createMenuDragMouseListener(JComponent c)
@@ -189,11 +189,11 @@
}
/**
- * Creates MenuKeyListener to listen to key events occuring when menu item is
- * visible on the screen.
- *
- * @param c
- * menu item to listen to
+ * Creates MenuKeyListener to listen to key events occuring when menu item
+ * is visible on the screen.
+ *
+ * @param c menu item to listen to
+ *
* @return The MenuKeyListener
*/
protected MenuKeyListener createMenuKeyListener(JComponent c)
@@ -203,9 +203,9 @@
/**
* Handles mouse input events occuring for this menu item
- *
- * @param c
- * menu item to listen to
+ *
+ * @param c menu item to listen to
+ *
* @return The MouseInputListener
*/
protected MouseInputListener createMouseInputListener(JComponent c)
@@ -216,9 +216,9 @@
/**
* Factory method to create a BasicMenuItemUI for the given [EMAIL PROTECTED]
* JComponent}, which should be a [EMAIL PROTECTED] JMenuItem}.
- *
- * @param c
- * The [EMAIL PROTECTED] JComponent} a UI is being created for.
+ *
+ * @param c The [EMAIL PROTECTED] JComponent} a UI is being created for.
+ *
* @return A BasicMenuItemUI for the [EMAIL PROTECTED] JComponent}.
*/
public static ComponentUI createUI(JComponent c)
@@ -228,9 +228,8 @@
/**
* Programatically clicks menu item.
- *
- * @param msm
- * MenuSelectionManager for the menu hierarchy
+ *
+ * @param msm MenuSelectionManager for the menu hierarchy
*/
protected void doClick(MenuSelectionManager msm)
{
@@ -240,9 +239,9 @@
/**
* Returns maximum size for the specified menu item
- *
- * @param c
- * component for which to get maximum size
+ *
+ * @param c component for which to get maximum size
+ *
* @return Maximum size for the specified menu item.
*/
public Dimension getMaximumSize(JComponent c)
@@ -252,9 +251,9 @@
/**
* Returns minimum size for the specified menu item
- *
- * @param c
- * component for which to get minimum size
+ *
+ * @param c component for which to get minimum size
+ *
* @return Minimum size for the specified menu item.
*/
public Dimension getMinimumSize(JComponent c)
@@ -264,9 +263,9 @@
/**
* Returns path to this menu item.
- *
- * @return $MenuElement[]$ Returns array of menu elements that constitute a
- * path to this menu item.
+ *
+ * @return $MenuElement[]$ Returns array of menu elements
+ * that constitute a path to this menu item.
*/
public MenuElement[] getPath()
{
@@ -279,12 +278,12 @@
Component c = menuItem;
while (c instanceof MenuElement)
{
- path.add(0, (MenuElement) c);
+ path.add(0, (MenuElement) c);
- if (c instanceof JPopupMenu)
- c = ((JPopupMenu) c).getInvoker();
- else
- c = c.getParent();
+ if (c instanceof JPopupMenu)
+ c = ((JPopupMenu) c).getInvoker();
+ else
+ c = c.getParent();
}
MenuElement[] pathArray = new MenuElement[path.size()];
@@ -294,15 +293,12 @@
/**
* Returns preferred size for the given menu item.
- *
- * @param c
- * menu item for which to get preferred size
- * @param checkIcon
- * check icon displayed in the given menu item
- * @param arrowIcon
- * arrow icon displayed in the given menu item
- * @param defaultTextIconGap
- * space between icon and text in the given menuItem
+ *
+ * @param c menu item for which to get preferred size
+ * @param checkIcon check icon displayed in the given menu item
+ * @param arrowIcon arrow icon displayed in the given menu item
+ * @param defaultTextIconGap space between icon and text in the given menuItem
+ *
* @return $Dimension$ preferred size for the given menu item
*/
protected Dimension getPreferredMenuItemSize(JComponent c, Icon checkIcon,
@@ -320,32 +316,31 @@
if (accelerator != null)
{
- rect = getAcceleratorRect(
- accelerator,
- m.getToolkit().getFontMetrics(acceleratorFont));
-
- // add width of accelerator's text
- d.width = d.width + rect.width + defaultAcceleratorLabelGap;
-
- // adjust the heigth of the preferred size if necessary
- if (d.height < rect.height)
- d.height = rect.height;
+ rect = getAcceleratorRect(accelerator,
+ m.getToolkit().getFontMetrics(acceleratorFont));
+
+ // add width of accelerator's text
+ d.width = d.width + rect.width + defaultAcceleratorLabelGap;
+
+ // adjust the heigth of the preferred size if necessary
+ if (d.height < rect.height)
+ d.height = rect.height;
}
if (checkIcon != null)
{
- d.width = d.width + checkIcon.getIconWidth() + defaultTextIconGap;
+ d.width = d.width + checkIcon.getIconWidth() + defaultTextIconGap;
- if (checkIcon.getIconHeight() > d.height)
- d.height = checkIcon.getIconHeight();
+ if (checkIcon.getIconHeight() > d.height)
+ d.height = checkIcon.getIconHeight();
}
if (arrowIcon != null && (c instanceof JMenu))
{
- d.width = d.width + arrowIcon.getIconWidth() + defaultTextIconGap;
+ d.width = d.width + arrowIcon.getIconWidth() + defaultTextIconGap;
- if (arrowIcon.getIconHeight() > d.height)
- d.height = arrowIcon.getIconHeight();
+ if (arrowIcon.getIconHeight() > d.height)
+ d.height = arrowIcon.getIconHeight();
}
return d;
@@ -353,19 +348,20 @@
/**
* Returns preferred size of the given component
- *
- * @param c
- * component for which to return preferred size
+ *
+ * @param c component for which to return preferred size
+ *
* @return $Dimension$ preferred size for the given component
*/
public Dimension getPreferredSize(JComponent c)
{
- return getPreferredMenuItemSize(c, checkIcon, arrowIcon, defaultTextIconGap);
+ return getPreferredMenuItemSize(c, checkIcon, arrowIcon,
+ defaultTextIconGap);
}
/**
* Returns the prefix for entries in the [EMAIL PROTECTED] UIDefaults} table.
- *
+ *
* @return "MenuItem"
*/
protected String getPropertyPrefix()
@@ -375,9 +371,8 @@
/**
* This method installs the components for this [EMAIL PROTECTED] JMenuItem}.
- *
- * @param menuItem
- * The [EMAIL PROTECTED] JMenuItem} to install components for.
+ *
+ * @param menuItem The [EMAIL PROTECTED] JMenuItem} to install components for.
*/
protected void installComponents(JMenuItem menuItem)
{
@@ -385,7 +380,7 @@
}
/**
- * This method installs the defaults that are defined in the Basic look and
+ * This method installs the defaults that are defined in the Basic look and
* feel for this [EMAIL PROTECTED] JMenuItem}.
*/
protected void installDefaults()
@@ -430,12 +425,11 @@
}
/**
- * Installs and initializes all fields for this UI delegate. Any properties of
- * the UI that need to be initialized and/or set to defaults will be done now.
- * It will also install any listeners necessary.
- *
- * @param c
- * The [EMAIL PROTECTED] JComponent} that is having this UI installed.
+ * Installs and initializes all fields for this UI delegate. Any properties
+ * of the UI that need to be initialized and/or set to defaults will be
+ * done now. It will also install any listeners necessary.
+ *
+ * @param c The [EMAIL PROTECTED] JComponent} that is having this UI installed.
*/
public void installUI(JComponent c)
{
@@ -448,11 +442,9 @@
/**
* Paints given menu item using specified graphics context
- *
- * @param g
- * The graphics context used to paint this menu item
- * @param c
- * Menu Item to paint
+ *
+ * @param g The graphics context used to paint this menu item
+ * @param c Menu Item to paint
*/
public void paint(Graphics g, JComponent c)
{
@@ -462,13 +454,10 @@
/**
* Paints background of the menu item
- *
- * @param g
- * The graphics context used to paint this menu item
- * @param menuItem
- * menu item to paint
- * @param bgColor
- * Background color to use when painting menu item
+ *
+ * @param g The graphics context used to paint this menu item
+ * @param menuItem menu item to paint
+ * @param bgColor Background color to use when painting menu item
*/
protected void paintBackground(Graphics g, JMenuItem menuItem, Color bgColor)
{
@@ -481,21 +470,15 @@
/**
* Paints specified menu item
- *
- * @param g
- * The graphics context used to paint this menu item
- * @param c
- * menu item to paint
- * @param checkIcon
- * check icon to use when painting menu item
- * @param arrowIcon
- * arrow icon to use when painting menu item
- * @param background
- * Background color of the menu item
- * @param foreground
- * Foreground color of the menu item
- * @param defaultTextIconGap
- * space to use between icon and text when painting menu item
+ *
+ * @param g The graphics context used to paint this menu item
+ * @param c menu item to paint
+ * @param checkIcon check icon to use when painting menu item
+ * @param arrowIcon arrow icon to use when painting menu item
+ * @param background Background color of the menu item
+ * @param foreground Foreground color of the menu item
+ * @param defaultTextIconGap space to use between icon and
+ * text when painting menu item
*/
protected void paintMenuItem(Graphics g, JComponent c, Icon checkIcon,
Icon arrowIcon, Color background,
@@ -521,10 +504,8 @@
SwingUtilities.calculateInsetArea(br, m.getInsets(), vr);
paintBackground(g, m, m.getBackground());
- /*
- * MenuItems insets are equal to menuItems margin, space between text and
- * menuItems border. We need to paint insets region as well.
- */
+ /* MenuItems insets are equal to menuItems margin, space between text and
+ menuItems border. We need to paint insets region as well. */
Insets insets = m.getInsets();
br.x -= insets.left;
br.y -= insets.top;
@@ -533,92 +514,89 @@
// Menu item is considered to be highlighted when it is selected.
// But we don't want to paint the background of JCheckBoxMenuItems
- if ((m.isSelected() && checkIcon == null) || m.getModel().isArmed()
- && (m.getParent() instanceof MenuElement))
+ if ((m.isSelected() && checkIcon == null) || m.getModel().isArmed() &&
+ (m.getParent() instanceof MenuElement))
{
- if (m.isContentAreaFilled())
- {
- g.setColor(selectionBackground);
- g.fillRect(br.x, br.y, br.width, br.height);
- }
+ if (m.isContentAreaFilled())
+ {
+ g.setColor(selectionBackground);
+ g.fillRect(br.x, br.y, br.width, br.height);
+ }
}
else
{
- if (m.isContentAreaFilled())
- {
- g.setColor(m.getBackground());
- g.fillRect(br.x, br.y, br.width, br.height);
- }
+ if (m.isContentAreaFilled())
+ {
+ g.setColor(m.getBackground());
+ g.fillRect(br.x, br.y, br.width, br.height);
+ }
}
// If this menu item is a JCheckBoxMenuItem then paint check icon
if (checkIcon != null)
{
- SwingUtilities.layoutCompoundLabel(m, fm, null, checkIcon, vertAlign,
- horAlign, vertTextPos, horTextPos,
- vr, cr, tr, defaultTextIconGap);
+ SwingUtilities.layoutCompoundLabel(m, fm, null, checkIcon, vertAlign,
+ horAlign, vertTextPos, horTextPos,
+ vr, cr, tr, defaultTextIconGap);
checkIcon.paintIcon(m, g, cr.x, cr.y);
- // We need to calculate position of the menu text and position of
- // user menu icon if there exists one relative to the check icon.
- // So we need to adjust view rectangle s.t. its starting point is at
- // checkIcon.width + defaultTextIconGap.
- vr.x = cr.x + cr.width + defaultTextIconGap;
+ // We need to calculate position of the menu text and position of
+ // user menu icon if there exists one relative to the check icon.
+ // So we need to adjust view rectangle s.t. its starting point is at
+ // checkIcon.width + defaultTextIconGap.
+ vr.x = cr.x + cr.width + defaultTextIconGap;
}
// if this is a submenu, then paint arrow icon to indicate it.
if (arrowIcon != null && (c instanceof JMenu))
{
- if (!((JMenu) c).isTopLevelMenu())
- {
- int width = arrowIcon.getIconWidth();
- int height = arrowIcon.getIconHeight();
-
- arrowIcon.paintIcon(m, g, vr.width - width + defaultTextIconGap,
- vr.y + 2);
- }
+ if (! ((JMenu) c).isTopLevelMenu())
+ {
+ int width = arrowIcon.getIconWidth();
+ int height = arrowIcon.getIconHeight();
+
+ arrowIcon.paintIcon(m, g, vr.width - width + defaultTextIconGap,
+ vr.y + 2);
+ }
}
- // paint text and user menu icon if it exists
+ // paint text and user menu icon if it exists
Icon i = m.getIcon();
- SwingUtilities.layoutCompoundLabel(c, fm, m.getText(), i, vertAlign,
- horAlign, vertTextPos, horTextPos, vr,
- ir, tr, defaultTextIconGap);
+ SwingUtilities.layoutCompoundLabel(c, fm, m.getText(), i,
+ vertAlign, horAlign, vertTextPos,
+ horTextPos, vr, ir, tr,
+ defaultTextIconGap);
if (i != null)
i.paintIcon(c, g, ir.x, ir.y);
paintText(g, m, tr, m.getText());
- // paint accelerator
+ // paint accelerator
String acceleratorText = "";
if (m.getAccelerator() != null)
{
- acceleratorText = getAcceleratorText(m.getAccelerator());
- fm = g.getFontMetrics(acceleratorFont);
- ar.width = fm.stringWidth(acceleratorText);
- ar.x = br.width - ar.width;
- vr.x = br.width - ar.width;
-
- SwingUtilities.layoutCompoundLabel(m, fm, acceleratorText, null,
- vertAlign, horAlign, vertTextPos,
- horTextPos, vr, ir, ar,
- defaultTextIconGap);
+ acceleratorText = getAcceleratorText(m.getAccelerator());
+ fm = g.getFontMetrics(acceleratorFont);
+ ar.width = fm.stringWidth(acceleratorText);
+ ar.x = br.width - ar.width;
+ vr.x = br.width - ar.width;
+
+ SwingUtilities.layoutCompoundLabel(m, fm, acceleratorText, null,
+ vertAlign, horAlign, vertTextPos,
+ horTextPos, vr, ir, ar,
+ defaultTextIconGap);
- paintAccelerator(g, m, ar, acceleratorText);
+ paintAccelerator(g, m, ar, acceleratorText);
}
}
/**
* Paints label for the given menu item
- *
- * @param g
- * The graphics context used to paint this menu item
- * @param menuItem
- * menu item for which to draw its label
- * @param textRect
- * rectangle specifiying position of the text relative to the given
- * menu item
- * @param text
- * label of the menu item
+ *
+ * @param g The graphics context used to paint this menu item
+ * @param menuItem menu item for which to draw its label
+ * @param textRect rectangle specifiying position of the text relative to
+ * the given menu item
+ * @param text label of the menu item
*/
protected void paintText(Graphics g, JMenuItem menuItem, Rectangle textRect,
String text)
@@ -627,45 +605,43 @@
g.setFont(f);
FontMetrics fm = g.getFontMetrics(f);
- if (text != null && !text.equals(""))
+ if (text != null && ! text.equals(""))
{
- if (menuItem.isEnabled())
+ if (menuItem.isEnabled())
{
// Menu item is considered to be highlighted when it is selected.
// But not if it's a JCheckBoxMenuItem
- if ((menuItem.isSelected() && checkIcon == null)
- || menuItem.getModel().isArmed()
- && (menuItem.getParent() instanceof MenuElement))
+ if ((menuItem.isSelected() && checkIcon == null) || menuItem.getModel().isArmed() &&
+ (menuItem.getParent() instanceof MenuElement))
g.setColor(selectionForeground);
else
g.setColor(menuItem.getForeground());
}
- else
- // FIXME: should fix this to use 'disabledForeground', but its
- // default value in BasicLookAndFeel is null.
-
+ else
+ // FIXME: should fix this to use 'disabledForeground', but its
+ // default value in BasicLookAndFeel is null.
+
// FIXME: should there be different foreground colours for selected
// or deselected, when disabled?
g.setColor(Color.gray);
- int mnemonicIndex = menuItem.getDisplayedMnemonicIndex();
+ int mnemonicIndex = menuItem.getDisplayedMnemonicIndex();
- if (mnemonicIndex != -1)
- BasicGraphicsUtils.drawStringUnderlineCharAt(g, text, mnemonicIndex,
- textRect.x,
- textRect.y
- + fm.getAscent());
- else
- BasicGraphicsUtils.drawString(g, text, 0, textRect.x,
- textRect.y + fm.getAscent());
+ if (mnemonicIndex != -1)
+ BasicGraphicsUtils.drawStringUnderlineCharAt(g, text, mnemonicIndex,
+ textRect.x,
+ textRect.y
+ + fm.getAscent());
+ else
+ BasicGraphicsUtils.drawString(g, text, 0, textRect.x,
+ textRect.y + fm.getAscent());
}
}
/**
* This method uninstalls the components for this [EMAIL PROTECTED] JMenuItem}.
- *
- * @param menuItem
- * The [EMAIL PROTECTED] JMenuItem} to uninstall components for.
+ *
+ * @param menuItem The [EMAIL PROTECTED] JMenuItem} to uninstall components for.
*/
protected void uninstallComponents(JMenuItem menuItem)
{
@@ -717,11 +693,10 @@
/**
* Performs the opposite of installUI. Any properties or resources that need
- * to be cleaned up will be done now. It will also uninstall any listeners it
- * has. In addition, any properties of this UI will be nulled.
- *
- * @param c
- * The [EMAIL PROTECTED] JComponent} that is having this UI uninstalled.
+ * to be cleaned up will be done now. It will also uninstall any listeners
+ * it has. In addition, any properties of this UI will be nulled.
+ *
+ * @param c The [EMAIL PROTECTED] JComponent} that is having this UI uninstalled.
*/
public void uninstallUI(JComponent c)
{
@@ -733,11 +708,9 @@
/**
* This method calls paint.
- *
- * @param g
- * The graphics context used to paint this menu item
- * @param c
- * The menu item to paint
+ *
+ * @param g The graphics context used to paint this menu item
+ * @param c The menu item to paint
*/
public void update(Graphics g, JComponent c)
{
@@ -746,9 +719,9 @@
/**
* Return text representation of the specified accelerator
- *
- * @param accelerator
- * Accelerator for which to return string representation
+ *
+ * @param accelerator Accelerator for which to return string representation
+ *
* @return $String$ Text representation of the given accelerator
*/
private String getAcceleratorText(KeyStroke accelerator)
@@ -771,11 +744,10 @@
/**
* Calculates and return rectange in which accelerator should be displayed
- *
- * @param accelerator
- * accelerator for which to return the display rectangle
- * @param fm
- * The font metrics used to measure the text
+ *
+ * @param accelerator accelerator for which to return the display rectangle
+ * @param fm The font metrics used to measure the text
+ *
* @return $Rectangle$ reactangle which will be used to display accelerator
*/
private Rectangle getAcceleratorRect(KeyStroke accelerator, FontMetrics fm)
@@ -787,16 +759,12 @@
/**
* Paints accelerator inside menu item
- *
- * @param g
- * The graphics context used to paint the border
- * @param menuItem
- * Menu item for which to draw accelerator
- * @param acceleratorRect
- * rectangle representing position of the accelerator relative to the
- * menu item
- * @param acceleratorText
- * accelerator's text
+ *
+ * @param g The graphics context used to paint the border
+ * @param menuItem Menu item for which to draw accelerator
+ * @param acceleratorRect rectangle representing position
+ * of the accelerator relative to the menu item
+ * @param acceleratorText accelerator's text
*/
private void paintAccelerator(Graphics g, JMenuItem menuItem,
Rectangle acceleratorRect,
@@ -817,9 +785,10 @@
}
/**
- * This class handles mouse events occuring inside the menu item. Most of the
- * events are forwarded for processing to MenuSelectionManager of the current
- * menu hierarchy.
+ * This class handles mouse events occuring inside the menu item.
+ * Most of the events are forwarded for processing to MenuSelectionManager
+ * of the current menu hierarchy.
+ *
*/
protected class MouseInputHandler implements MouseInputListener
{
@@ -831,11 +800,10 @@
}
/**
- * This method is called when mouse is clicked on the menu item. It forwards
- * this event to MenuSelectionManager.
- *
- * @param e
- * A [EMAIL PROTECTED] MouseEvent}.
+ * This method is called when mouse is clicked on the menu item.
+ * It forwards this event to MenuSelectionManager.
+ *
+ * @param e A [EMAIL PROTECTED] MouseEvent}.
*/
public void mouseClicked(MouseEvent e)
{
@@ -844,11 +812,10 @@
}
/**
- * This method is called when mouse is dragged inside the menu item. It
- * forwards this event to MenuSelectionManager.
- *
- * @param e
- * A [EMAIL PROTECTED] MouseEvent}.
+ * This method is called when mouse is dragged inside the menu item.
+ * It forwards this event to MenuSelectionManager.
+ *
+ * @param e A [EMAIL PROTECTED] MouseEvent}.
*/
public void mouseDragged(MouseEvent e)
{
@@ -857,31 +824,29 @@
}
/**
- * This method is called when mouse enters menu item. When this happens menu
- * item is considered to be selected and selection path in
- * MenuSelectionManager is set. This event is also forwarded to
- * MenuSelection Manager for further processing.
- *
- * @param e
- * A [EMAIL PROTECTED] MouseEvent}.
+ * This method is called when mouse enters menu item.
+ * When this happens menu item is considered to be selected and selection path
+ * in MenuSelectionManager is set. This event is also forwarded to MenuSelection
+ * Manager for further processing.
+ *
+ * @param e A [EMAIL PROTECTED] MouseEvent}.
*/
public void mouseEntered(MouseEvent e)
{
Component source = (Component) e.getSource();
if (source.getParent() instanceof MenuElement)
{
- MenuSelectionManager manager = MenuSelectionManager.defaultManager();
- manager.setSelectedPath(getPath());
- manager.processMouseEvent(e);
+ MenuSelectionManager manager = MenuSelectionManager.defaultManager();
+ manager.setSelectedPath(getPath());
+ manager.processMouseEvent(e);
}
}
/**
- * This method is called when mouse exits menu item. The event is forwarded
- * to MenuSelectionManager for processing.
- *
- * @param e
- * A [EMAIL PROTECTED] MouseEvent}.
+ * This method is called when mouse exits menu item. The event is
+ * forwarded to MenuSelectionManager for processing.
+ *
+ * @param e A [EMAIL PROTECTED] MouseEvent}.
*/
public void mouseExited(MouseEvent e)
{
@@ -890,11 +855,10 @@
}
/**
- * This method is called when mouse is inside the menu item. This event is
- * forwarder to MenuSelectionManager for further processing.
- *
- * @param e
- * A [EMAIL PROTECTED] MouseEvent}.
+ * This method is called when mouse is inside the menu item.
+ * This event is forwarder to MenuSelectionManager for further processing.
+ *
+ * @param e A [EMAIL PROTECTED] MouseEvent}.
*/
public void mouseMoved(MouseEvent e)
{
@@ -905,9 +869,8 @@
/**
* This method is called when mouse is pressed. This event is forwarded to
* MenuSelectionManager for further processing.
- *
- * @param e
- * A [EMAIL PROTECTED] MouseEvent}.
+ *
+ * @param e A [EMAIL PROTECTED] MouseEvent}.
*/
public void mousePressed(MouseEvent e)
{
@@ -919,9 +882,8 @@
* This method is called when mouse is released. If the mouse is released
* inside this menuItem, then this menu item is considered to be chosen and
* the menu hierarchy should be closed.
- *
- * @param e
- * A [EMAIL PROTECTED] MouseEvent}.
+ *
+ * @param e A [EMAIL PROTECTED] MouseEvent}.
*/
public void mouseReleased(MouseEvent e)
{
@@ -930,12 +892,12 @@
if (e.getX() > 0 && e.getX() < size.width && e.getY() > 0
&& e.getY() < size.height)
{
- manager.clearSelectedPath();
- menuItem.doClick();
+ manager.clearSelectedPath();
+ menuItem.doClick();
}
else
- manager.processMouseEvent(e);
+ manager.processMouseEvent(e);
}
}
@@ -946,9 +908,8 @@
{
/**
* Tbis method is invoked when mouse is dragged over the menu item.
- *
- * @param e
- * The MenuDragMouseEvent
+ *
+ * @param e The MenuDragMouseEvent
*/
public void menuDragMouseDragged(MenuDragMouseEvent e)
{
@@ -957,11 +918,10 @@
}
/**
- * Tbis method is invoked when mouse enters the menu item while it is being
- * dragged.
- *
- * @param e
- * The MenuDragMouseEvent
+ * Tbis method is invoked when mouse enters the menu item while it is
+ * being dragged.
+ *
+ * @param e The MenuDragMouseEvent
*/
public void menuDragMouseEntered(MenuDragMouseEvent e)
{
@@ -970,29 +930,27 @@
}
/**
- * Tbis method is invoked when mouse exits the menu item while it is being
- * dragged
- *
- * @param e
- * The MenuDragMouseEvent
+ * Tbis method is invoked when mouse exits the menu item while
+ * it is being dragged
+ *
+ * @param e The MenuDragMouseEvent
*/
public void menuDragMouseExited(MenuDragMouseEvent e)
{
}
/**
- * Tbis method is invoked when mouse was dragged and released inside the
- * menu item.
- *
- * @param e
- * The MenuDragMouseEvent
+ * Tbis method is invoked when mouse was dragged and released
+ * inside the menu item.
+ *
+ * @param e The MenuDragMouseEvent
*/
public void menuDragMouseReleased(MenuDragMouseEvent e)
{
MenuElement[] path = e.getPath();
if (path[path.length - 1] instanceof JMenuItem)
- ((JMenuItem) path[path.length - 1]).doClick();
+ ((JMenuItem) path[path.length - 1]).doClick();
MenuSelectionManager manager = MenuSelectionManager.defaultManager();
manager.clearSelectedPath();
@@ -1007,9 +965,8 @@
{
/**
* This method is invoked when key has been pressed
- *
- * @param e
- * A [EMAIL PROTECTED] MenuKeyEvent}.
+ *
+ * @param e A [EMAIL PROTECTED] MenuKeyEvent}.
*/
public void menuKeyPressed(MenuKeyEvent e)
{
@@ -1017,20 +974,18 @@
/**
* This method is invoked when key has been pressed
- *
- * @param e
- * A [EMAIL PROTECTED] MenuKeyEvent}.
+ *
+ * @param e A [EMAIL PROTECTED] MenuKeyEvent}.
*/
public void menuKeyReleased(MenuKeyEvent e)
{
}
/**
- * This method is invoked when key has been typed It handles the mnemonic
- * key for the menu item.
- *
- * @param e
- * A [EMAIL PROTECTED] MenuKeyEvent}.
+ * This method is invoked when key has been typed
+ * It handles the mnemonic key for the menu item.
+ *
+ * @param e A [EMAIL PROTECTED] MenuKeyEvent}.
*/
public void menuKeyTyped(MenuKeyEvent e)
{
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches
