changeset 5481:1369bb06dabe

RT-33727 Remove impl_mouseEvent once DTL-5364 is resolved Reviewed-by: lnerad
author Martin Sladecek <martin.sladecek@oracle.com>
date Tue, 22 Oct 2013 13:47:58 +0200
parents e971b9ac99d8
children 04abf455eec9
files modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ScrollPaneSkinTest.java modules/graphics/src/main/java/javafx/scene/input/MouseEvent.java
diffstat 2 files changed, 6 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ScrollPaneSkinTest.java	Tue Oct 22 11:00:37 2013 +0200
+++ b/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ScrollPaneSkinTest.java	Tue Oct 22 13:47:58 2013 +0200
@@ -39,10 +39,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.ScrollPane;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.input.ScrollEvent;
-import javafx.scene.input.SwipeEvent;
+import javafx.scene.input.*;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.Region;
@@ -368,11 +365,11 @@
         stage.show();
 
         Event.fireEvent(scrollPaneInner,
-              MouseEvent.impl_mouseEvent(50.0, 50.0, 50.0, 50.0,
+              new MouseEvent(MouseEvent.MOUSE_CLICKED, 50.0, 50.0, 50.0, 50.0,
                          MouseButton.PRIMARY, 1,
                          false, false, false, false, false,
-                         true, false, false, false,
-                         MouseEvent.MOUSE_CLICKED));
+                         true, false, false, false, false, null
+                         ));
 
         /*
         ** did it work?
@@ -834,9 +831,9 @@
                 primaryButtonDown = false;
             }
 
-            MouseEvent event = MouseEvent.impl_mouseEvent(x, y, x, y, button,
+            MouseEvent event = new MouseEvent(type, x, y, x, y, button,
                     1, false, false, false, false, false, primaryButtonDown,
-                    false, false, false, type);
+                    false, false, false, false, null);
 
             return event;
         }
--- a/modules/graphics/src/main/java/javafx/scene/input/MouseEvent.java	Tue Oct 22 11:00:37 2013 +0200
+++ b/modules/graphics/src/main/java/javafx/scene/input/MouseEvent.java	Tue Oct 22 13:47:58 2013 +0200
@@ -294,35 +294,6 @@
         return e;
     }
 
-    //SB-dependency: RT-21224. Need to be sure that SB does use new API before removing this.
-    /**
-     * @treatAsPrivate implementation detail
-     * @deprecated This is an internal API that is not intended for use and will be removed in the next version
-     */
-    @Deprecated
-    public static MouseEvent impl_mouseEvent(double _x, double _y,
-          double _screenX, double _screenY,
-          MouseButton _button,
-          int _clickCount,
-          boolean _shiftDown,
-          boolean _controlDown,
-          boolean _altDown,
-          boolean _metaDown,
-          boolean _popupTrigger,
-          boolean _primaryButtonDown,
-          boolean _middleButtonDown,
-          boolean _secondaryButtonDown,
-          boolean _synthesized,
-          EventType<? extends MouseEvent> _eventType
-          ) {
-        return new MouseEvent(
-                _eventType, _x, _y, _screenX, _screenY,
-                _button, _clickCount,
-                _shiftDown, _controlDown, _altDown, _metaDown,
-                _primaryButtonDown, _middleButtonDown, _secondaryButtonDown, 
-                _synthesized, _popupTrigger, false, null);
-    }
-
     /**
      * Constructs new MouseEvent event with null source and target.
      * @param eventType The type of the event.