changeset 1466:f724f741f885

Automated merge with ssh://jpgodine@jfxsrc.us.oracle.com//javafx/2.2/MASTER/jfx/rt
author jpgodine@JPGODINE-LAP.st-users.us.oracle.com
date Tue, 24 Jul 2012 09:24:06 -0700
parents 4e47913d1062 15b6051f1219
children b64bf5349e9e
files
diffstat 2 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/javafx/scene/input/GestureEvent.java	Wed Jul 18 14:57:42 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/GestureEvent.java	Tue Jul 24 09:24:06 2012 -0700
@@ -35,6 +35,12 @@
 /**
  * An event indicating gesture input. Gestures are typically caused by
  * direct (touch screen) or indirect (track pad) touch events.
+ *
+ * <p>
+ * Delivery of gestures is dependent on the capabilities of the underlying
+ * platform and connected input devices. For instance on a PC with mouse
+ * and keyboard there is no way of producing a rotating gesture.
+ * </p>
  * @since 2.2
  */
 public class GestureEvent extends InputEvent {
--- a/javafx-ui-common/src/javafx/scene/input/SwipeEvent.java	Wed Jul 18 14:57:42 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/SwipeEvent.java	Tue Jul 24 09:24:06 2012 -0700
@@ -42,6 +42,11 @@
  * Note that swipe and scroll gestures are not exclusive. A single touch screen
  * action can result in both gestures being delivered.
  * <p>
+ * Note that the capability to produce swipes is dependent on the used input
+ * devices and underlying platform's capabilities and settings (especially
+ * without touch-screen user's possibilities of producing swipes are
+ * significantly reduced).
+ * <p>
  * As all gestures, swipe can be direct (performed directly at
  * the concrete coordinates as on touch screen - the center of the gesture
  * is used as gesture coordinates) or indirect (performed