提交 e33e4243 编写于 作者: A alexsch

7109991: SwingUtilities.isXMouseButton behaves unexpectedly starting from JDK8 b08

Reviewed-by: rupashka
上级 3d4c6a66
...@@ -321,14 +321,15 @@ public abstract class InputEvent extends ComponentEvent { ...@@ -321,14 +321,15 @@ public abstract class InputEvent extends ComponentEvent {
* @param when a long int that gives the time the event occurred. * @param when a long int that gives the time the event occurred.
* Passing negative or zero value * Passing negative or zero value
* is not recommended * is not recommended
* @param modifiers the modifier keys down during event (e.g. shift, ctrl, * @param modifiers a modifier mask describing the modifier keys and mouse
* alt, meta) * buttons (for example, shift, ctrl, alt, and meta) that
* Passing negative parameter is not recommended. * are down during the event.
* Zero value means no modifiers. * Only extended modifiers are allowed to be used as a
* Either extended _DOWN_MASK or old _MASK modifiers * value for this parameter (see the {@link InputEvent#getModifiersEx}
* should be used, but both models should not be mixed * class for the description of extended modifiers).
* in one event. Use of the extended modifiers is * Passing negative parameter
* preferred * is not recommended.
* Zero value means that no modifiers were passed
* @throws IllegalArgumentException if <code>source</code> is null * @throws IllegalArgumentException if <code>source</code> is null
* @see #getSource() * @see #getSource()
* @see #getID() * @see #getID()
...@@ -416,9 +417,13 @@ public abstract class InputEvent extends ComponentEvent { ...@@ -416,9 +417,13 @@ public abstract class InputEvent extends ComponentEvent {
/** /**
* Returns the extended modifier mask for this event. * Returns the extended modifier mask for this event.
* <P>
* Extended modifiers are the modifiers that ends with the _DOWN_MASK suffix,
* such as ALT_DOWN_MASK, BUTTON1_DOWN_MASK, and others.
* <P>
* Extended modifiers represent the state of all modal keys, * Extended modifiers represent the state of all modal keys,
* such as ALT, CTRL, META, and the mouse buttons just after * such as ALT, CTRL, META, and the mouse buttons just after
* the event occurred * the event occurred.
* <P> * <P>
* For example, if the user presses <b>button 1</b> followed by * For example, if the user presses <b>button 1</b> followed by
* <b>button 2</b>, and then releases them in the same order, * <b>button 2</b>, and then releases them in the same order,
......
...@@ -488,14 +488,15 @@ public class MouseEvent extends InputEvent { ...@@ -488,14 +488,15 @@ public class MouseEvent extends InputEvent {
* @param when A long integer that gives the time the event occurred. * @param when A long integer that gives the time the event occurred.
* Passing negative or zero value * Passing negative or zero value
* is not recommended * is not recommended
* @param modifiers The modifier keys down during event (e.g. shift, ctrl, * @param modifiers a modifier mask describing the modifier keys and mouse
* alt, meta) * buttons (for example, shift, ctrl, alt, and meta) that
* are down during the event.
* Only extended modifiers are allowed to be used as a
* value for this parameter (see the {@link InputEvent#getModifiersEx}
* class for the description of extended modifiers).
* Passing negative parameter * Passing negative parameter
* is not recommended. * is not recommended.
* Zero value means that no modifiers were passed. * Zero value means that no modifiers were passed
* Use either an extended _DOWN_MASK or old _MASK modifiers,
* however do not mix models in the one event.
* The extended modifiers are preferred for using
* @param x The horizontal x coordinate for the mouse location. * @param x The horizontal x coordinate for the mouse location.
* It is allowed to pass negative values * It is allowed to pass negative values
* @param y The vertical y coordinate for the mouse location. * @param y The vertical y coordinate for the mouse location.
...@@ -586,14 +587,15 @@ public class MouseEvent extends InputEvent { ...@@ -586,14 +587,15 @@ public class MouseEvent extends InputEvent {
* @param when A long integer that gives the time the event occurred. * @param when A long integer that gives the time the event occurred.
* Passing negative or zero value * Passing negative or zero value
* is not recommended * is not recommended
* @param modifiers The modifier keys down during event (e.g. shift, ctrl, * @param modifiers a modifier mask describing the modifier keys and mouse
* alt, meta) * buttons (for example, shift, ctrl, alt, and meta) that
* are down during the event.
* Only extended modifiers are allowed to be used as a
* value for this parameter (see the {@link InputEvent#getModifiersEx}
* class for the description of extended modifiers).
* Passing negative parameter * Passing negative parameter
* is not recommended. * is not recommended.
* Zero value means that no modifiers were passed. * Zero value means that no modifiers were passed
* Use either an extended _DOWN_MASK or old _MASK modifiers,
* however do not mix models in the one event.
* The extended modifiers are preferred for using
* @param x The horizontal x coordinate for the mouse location. * @param x The horizontal x coordinate for the mouse location.
* It is allowed to pass negative values * It is allowed to pass negative values
* @param y The vertical y coordinate for the mouse location. * @param y The vertical y coordinate for the mouse location.
...@@ -657,14 +659,15 @@ public class MouseEvent extends InputEvent { ...@@ -657,14 +659,15 @@ public class MouseEvent extends InputEvent {
* @param when A long integer that gives the time the event occurred. * @param when A long integer that gives the time the event occurred.
* Passing negative or zero value * Passing negative or zero value
* is not recommended * is not recommended
* @param modifiers The modifier keys down during event (e.g. shift, ctrl, * @param modifiers a modifier mask describing the modifier keys and mouse
* alt, meta) * buttons (for example, shift, ctrl, alt, and meta) that
* are down during the event.
* Only extended modifiers are allowed to be used as a
* value for this parameter (see the {@link InputEvent#getModifiersEx}
* class for the description of extended modifiers).
* Passing negative parameter * Passing negative parameter
* is not recommended. * is not recommended.
* Zero value means that no modifiers were passed. * Zero value means that no modifiers were passed
* Use either an extended _DOWN_MASK or old _MASK modifiers,
* however do not mix models in the one event.
* The extended modifiers are preferred for using
* @param x The horizontal x coordinate for the mouse location. * @param x The horizontal x coordinate for the mouse location.
* It is allowed to pass negative values * It is allowed to pass negative values
* @param y The vertical y coordinate for the mouse location. * @param y The vertical y coordinate for the mouse location.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册