diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/Application.java b/modules/graphics/src/main/java/com/sun/glass/ui/Application.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/Application.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/Application.java @@ -97,12 +97,10 @@ private static Application application; private static Thread eventThread; private static final boolean disableThreadChecks = - AccessController.doPrivileged(new PrivilegedAction() { - public Boolean run() { - final String str = - System.getProperty("glass.disableThreadChecks", "false"); - return "true".equalsIgnoreCase(str); - } + AccessController.doPrivileged((PrivilegedAction) () -> { + final String str = + System.getProperty("glass.disableThreadChecks", "false"); + return "true".equalsIgnoreCase(str); }); // May be called on any thread. @@ -151,11 +149,9 @@ // on Linux - TODO //application.name = DEFAULT_NAME; // default try { - application.runLoop(new Runnable() { - @Override public void run() { - Screen.initScreens(); - launchable.run(); - } + application.runLoop(() -> { + Screen.initScreens(); + launchable.run(); }); } catch (Throwable t) { t.printStackTrace(); @@ -218,11 +214,7 @@ */ public String getDataDirectory() { checkEventThread(); - String userHome = AccessController.doPrivileged(new PrivilegedAction() { - @Override public String run() { - return System.getProperty("user.home"); - } - }); + String userHome = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("user.home")); return userHome + File.separator + "." + name + File.separator; } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/EventLoop.java b/modules/graphics/src/main/java/com/sun/glass/ui/EventLoop.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/EventLoop.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/EventLoop.java @@ -116,13 +116,11 @@ stack.pop(); if (!stack.isEmpty() && stack.peek().state.equals(State.LEAVING)) { - Application.invokeLater(new java.lang.Runnable() { - @Override public void run() { - EventLoop loop = stack.peek(); - // we might have already entered another loop, so check again - if (loop != null && loop.state.equals(State.LEAVING)) { - Application.leaveNestedEventLoop(loop); - } + Application.invokeLater(() -> { + EventLoop loop = stack.peek(); + // we might have already entered another loop, so check again + if (loop != null && loop.state.equals(State.LEAVING)) { + Application.leaveNestedEventLoop(loop); } }); } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/GestureSupport.java b/modules/graphics/src/main/java/com/sun/glass/ui/GestureSupport.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/GestureSupport.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/GestureSupport.java @@ -372,36 +372,32 @@ public TouchInputSupport.TouchCountListener createTouchCountListener() { Application.checkEventThread(); - return new TouchInputSupport.TouchCountListener() { + return (sender, view, modifiers, isDirect) -> { + final boolean isInertia = false; - public void touchCountChanged(TouchInputSupport sender, View view, - int modifiers, boolean isDirect) { - final boolean isInertia = false; + if (isScrolling()) { + handleScrollingEnd(view, modifiers, sender.getTouchCount(), + isDirect, isInertia, + View.GESTURE_NO_VALUE, + View.GESTURE_NO_VALUE, + View.GESTURE_NO_VALUE, + View.GESTURE_NO_VALUE); + } - if (isScrolling()) { - handleScrollingEnd(view, modifiers, sender.getTouchCount(), - isDirect, isInertia, - View.GESTURE_NO_VALUE, - View.GESTURE_NO_VALUE, - View.GESTURE_NO_VALUE, - View.GESTURE_NO_VALUE); - } + if (isRotating()) { + handleRotationEnd(view, modifiers, isDirect, isInertia, + View.GESTURE_NO_VALUE, + View.GESTURE_NO_VALUE, + View.GESTURE_NO_VALUE, + View.GESTURE_NO_VALUE); + } - if (isRotating()) { - handleRotationEnd(view, modifiers, isDirect, isInertia, - View.GESTURE_NO_VALUE, - View.GESTURE_NO_VALUE, - View.GESTURE_NO_VALUE, - View.GESTURE_NO_VALUE); - } - - if (isZooming()) { - handleZoomingEnd(view, modifiers, isDirect, isInertia, - View.GESTURE_NO_VALUE, - View.GESTURE_NO_VALUE, - View.GESTURE_NO_VALUE, - View.GESTURE_NO_VALUE); - } + if (isZooming()) { + handleZoomingEnd(view, modifiers, isDirect, isInertia, + View.GESTURE_NO_VALUE, + View.GESTURE_NO_VALUE, + View.GESTURE_NO_VALUE, + View.GESTURE_NO_VALUE); } }; } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/Platform.java b/modules/graphics/src/main/java/com/sun/glass/ui/Platform.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/Platform.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/Platform.java @@ -43,11 +43,7 @@ // Provide for a runtime override, allowing EGL for example String userPlatform = - AccessController.doPrivileged(new PrivilegedAction() { - public String run() { - return System.getProperty("glass.platform"); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("glass.platform")); if (userPlatform != null) { if (userPlatform.equals("macosx")) diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java b/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java @@ -40,12 +40,7 @@ private static final int dpiOverride; static { - dpiOverride = AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Integer run() { - return Integer.getInteger("com.sun.javafx.screenDPI", 0); - } - }).intValue(); + dpiOverride = AccessController.doPrivileged((PrivilegedAction) () -> Integer.getInteger("com.sun.javafx.screenDPI", 0)).intValue(); } public static class EventHandler { diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/View.java b/modules/graphics/src/main/java/com/sun/glass/ui/View.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/View.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/View.java @@ -38,25 +38,23 @@ public final static int GESTURE_NO_VALUE = Integer.MAX_VALUE; public final static double GESTURE_NO_DOUBLE_VALUE = Double.NaN; - final static boolean accessible = AccessController.doPrivileged(new PrivilegedAction() { - public Boolean run() { - boolean force = Boolean.getBoolean("javafx.accessible.force"); - if (force) return true; + final static boolean accessible = AccessController.doPrivileged((PrivilegedAction) () -> { + boolean force = Boolean.getBoolean("javafx.accessible.force"); + if (force) return true; - /* Only enable accessibility for Mac 10.9 and Windows 8 or greater. - * All other platforms must use the force flag. - */ - try { - String platform = Platform.determinePlatform(); - String version = System.getProperty("os.version").replaceFirst("(\\d+\\.\\d+).*", "$1"); - float v = Float.parseFloat(version); - boolean allowedPlatform = (platform.equals(Platform.MAC) && v >= 10.9f) || - (platform.equals(Platform.WINDOWS) && v >= 6.2f); - - return allowedPlatform ? Boolean.getBoolean("javafx.accessible") : false; - } catch (Exception e) { - return false; - } + /* Only enable accessibility for Mac 10.9 and Windows 8 or greater. + * All other platforms must use the force flag. + */ + try { + String platform = Platform.determinePlatform(); + String version = System.getProperty("os.version").replaceFirst("(\\d+\\.\\d+).*", "$1"); + float v = Float.parseFloat(version); + boolean allowedPlatform = (platform.equals(Platform.MAC) && v >= 10.9f) || + (platform.equals(Platform.WINDOWS) && v >= 6.2f); + + return allowedPlatform ? Boolean.getBoolean("javafx.accessible") : false; + } catch (Exception e) { + return false; } }); diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/Window.java b/modules/graphics/src/main/java/com/sun/glass/ui/Window.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/Window.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/Window.java @@ -592,18 +592,8 @@ } add(this); if (parent != 0) { - final Runnable checkRunnable = new Runnable() { - @Override - public void run() { - checkScreenLocation(); - } - }; - final Runnable timerRunnable = new Runnable() { - @Override - public void run() { - Application.invokeLater(checkRunnable); - } - }; + final Runnable checkRunnable = () -> checkScreenLocation(); + final Runnable timerRunnable = () -> Application.invokeLater(checkRunnable); embeddedLocationTimer = Application.GetApplication().createTimer(timerRunnable); embeddedLocationTimer.start(16); diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java b/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java @@ -48,11 +48,9 @@ final class GtkApplication extends Application implements InvokeLaterDispatcher.InvokeLaterSubmitter { static { - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - Application.loadNativeLibrary(); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + Application.loadNativeLibrary(); + return null; }); } @@ -64,12 +62,7 @@ GtkApplication() { boolean isEventThread = AccessController - .doPrivileged(new PrivilegedAction() { - public Boolean run() { - // Embedded in SWT, with shared event thread - return Boolean.getBoolean("javafx.embed.isEventThread"); - } - }); + .doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.embed.isEventThread")); if (!isEventThread) { invokeLaterDispatcher = new InvokeLaterDispatcher(this); invokeLaterDispatcher.start(); @@ -106,12 +99,8 @@ eventProc = result == null ? 0 : result; } - final boolean disableGrab = AccessController.doPrivileged(new PrivilegedAction() { - public Boolean run() { - return Boolean.getBoolean("sun.awt.disablegrab") || - Boolean.getBoolean("glass.disableGrab"); - } - }); + final boolean disableGrab = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("sun.awt.disablegrab") || + Boolean.getBoolean("glass.disableGrab")); _init(eventProc, disableGrab); } @@ -119,12 +108,7 @@ @Override protected void runLoop(final Runnable launchable) { final boolean isEventThread = AccessController - .doPrivileged(new PrivilegedAction() { - public Boolean run() { - // Embedded in SWT, with shared event thread - return Boolean.getBoolean("javafx.embed.isEventThread"); - } - }); + .doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.embed.isEventThread")); if (isEventThread) { init(); @@ -134,23 +118,13 @@ } final boolean noErrorTrap = AccessController - .doPrivileged(new PrivilegedAction() { - public Boolean run() { - return Boolean.getBoolean("glass.noErrorTrap"); - } - }); + .doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("glass.noErrorTrap")); final Thread toolkitThread = - AccessController.doPrivileged(new PrivilegedAction() { - public Thread run() { - return new Thread(new Runnable() { - public void run() { - init(); - _runLoop(launchable, noErrorTrap); - } - }, "GtkNativeMainLoopThread"); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> new Thread(() -> { + init(); + _runLoop(launchable, noErrorTrap); + }, "GtkNativeMainLoopThread")); setEventThread(toolkitThread); toolkitThread.start(); } @@ -181,11 +155,9 @@ invokeLaterDispatcher.invokeAndWait(runnable); } else { final CountDownLatch latch = new CountDownLatch(1); - submitForLaterInvocation(new Runnable() { - public void run() { - if (runnable != null) runnable.run(); - latch.countDown(); - } + submitForLaterInvocation(() -> { + if (runnable != null) runnable.run(); + latch.countDown(); }); try { latch.await(); diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java b/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java @@ -39,12 +39,9 @@ private static native void _initIDs(); // init IDs for java callbacks from native static { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - Application.loadNativeLibrary(); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + Application.loadNativeLibrary(); + return null; }); _initIDs(); } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java b/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java @@ -111,19 +111,9 @@ private static void initLibrary() { final String lensProperty = "glass.lens"; final String platform = AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public String run() { - return System.getProperty(lensProperty, ""); - } - }); + (PrivilegedAction) () -> System.getProperty(lensProperty, "")); - doComposite = AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Boolean run() { - return Boolean.getBoolean("doNativeComposite"); - } - }); + doComposite = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("doNativeComposite")); if (isInitialized) { //make sure we make this only once @@ -137,12 +127,9 @@ "System property " + lensProperty + " not defined"); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - Application.loadNativeLibrary("glass_lens_" + platform); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + Application.loadNativeLibrary("glass_lens_" + platform); + return null; }); _initIDs(); isInitialized = true; @@ -907,16 +894,13 @@ protected void runLoop(Runnable launchable) { _invokeLater(launchable); Thread toolkitThread = new Thread( - new Runnable() { - @Override - public void run() { - if (!_initialize()) { - LensLogger.getLogger().severe("Display failed initialization"); - throw new RuntimeException("Display failed initialization"); - } - _runLoop(); - } - }, "Lens Event Thread"); + () -> { + if (!_initialize()) { + LensLogger.getLogger().severe("Display failed initialization"); + throw new RuntimeException("Display failed initialization"); + } + _runLoop(); + }, "Lens Event Thread"); setEventThread(toolkitThread); toolkitThread.start(); Runtime.getRuntime().addShutdownHook(new Thread() { @@ -943,17 +927,14 @@ final LensApplication lensApplication = (LensApplication)Application.GetApplication(); - Thread eventThread = new Thread(new Runnable() { - @Override - public void run() { - registerEventLoop(); - lensApplication.nativeEventLoop(lensApplication, - nativeEventHandler, data); + Thread eventThread = new Thread(() -> { + registerEventLoop(); + lensApplication.nativeEventLoop(lensApplication, + nativeEventHandler, data); - //when the native function return - //event loop has exited - unregisterEventLoop(); - } + //when the native function return + //event loop has exited + unregisterEventLoop(); }, ("Lens Native Event Thread " + (nativeThreadCounter++))); LensLogger.getLogger().info("Starting native event thread"); diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensLogger.java b/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensLogger.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensLogger.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensLogger.java @@ -38,11 +38,7 @@ private static PlatformLogger initLogger() { PlatformLogger logger = PlatformLogger.getLogger("lens"); String levelString = AccessController.doPrivileged( - new PrivilegedAction() { - public String run() { - return System.getProperty("log.lens", "SEVERE").toUpperCase(Locale.ROOT); - } - }); + (PrivilegedAction) () -> System.getProperty("log.lens", "SEVERE").toUpperCase(Locale.ROOT)); try { logger.setLevel(Level.valueOf(levelString)); } catch (Exception e) { diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensTouchInputSupport.java b/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensTouchInputSupport.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensTouchInputSupport.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensTouchInputSupport.java @@ -89,44 +89,19 @@ static { touchTapRadius = AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public Integer run() { - return Integer.getInteger("lens.input.touch.TapRadius", 20); - } - }); + (PrivilegedAction) () -> Integer.getInteger("lens.input.touch.TapRadius", 20)); touchMoveSensitivity = AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public Integer run() { - return Integer.getInteger("lens.input.touch.MoveSensitivity", 20); - } - }); + (PrivilegedAction) () -> Integer.getInteger("lens.input.touch.MoveSensitivity", 20)); pruneInputDevices = AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public Boolean run() { - return Boolean.getBoolean("lens.input.pruneDevices"); - } - }); + (PrivilegedAction) () -> Boolean.getBoolean("lens.input.pruneDevices")); useMultiTouch = AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public Boolean run() { - return !(Boolean.getBoolean("lens.input.forceSingleTouch")); - } - }); + (PrivilegedAction) () -> !(Boolean.getBoolean("lens.input.forceSingleTouch"))); enableDeviceTrace = AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public Boolean run() { - return Boolean.getBoolean("lens.input.trace"); - } - }); + (PrivilegedAction) () -> Boolean.getBoolean("lens.input.trace")); } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java b/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java @@ -46,11 +46,9 @@ private native static void _initIDs(); static { - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - Application.loadNativeLibrary(); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + Application.loadNativeLibrary(); + return null; }); _initIDs(); } @@ -62,12 +60,7 @@ MacApplication() { boolean isEventThread = AccessController - .doPrivileged(new PrivilegedAction() { - public Boolean run() { - // Embedded in SWT, with shared event thread - return Boolean.getBoolean("javafx.embed.isEventThread"); - } - }); + .doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.embed.isEventThread")); if (!isEventThread) { invokeLaterDispatcher = new InvokeLaterDispatcher(this); invokeLaterDispatcher.start(); @@ -83,11 +76,9 @@ @Override protected void runLoop(final Runnable launchable) { isTaskbarApplication = - AccessController.doPrivileged(new PrivilegedAction() { - public Boolean run() { - String taskbarAppProp = System.getProperty("glass.taskbarApplication"); - return !"false".equalsIgnoreCase(taskbarAppProp); - } + AccessController.doPrivileged((PrivilegedAction) () -> { + String taskbarAppProp = System.getProperty("glass.taskbarApplication"); + return !"false".equalsIgnoreCase(taskbarAppProp); }); ClassLoader classLoader = MacApplication.class.getClassLoader(); diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacCommonDialogs.java b/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacCommonDialogs.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacCommonDialogs.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacCommonDialogs.java @@ -72,10 +72,6 @@ static boolean isFileNSURLEnabled() { // The check is dynamic since an app may want to toggle it dynamically. // The performance is not critical for FileChoosers. - return AccessController.doPrivileged(new PrivilegedAction() { - public Boolean run() { - return Boolean.getBoolean("glass.macosx.enableFileNSURL"); - } - }); + return AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("glass.macosx.enableFileNSURL")); } } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java @@ -68,30 +68,23 @@ /** A running count of the numbers of devices with each device capability */ private int[] deviceFlags = new int[DEVICE_MAX + 1]; - private Runnable renderEndNotifier = new Runnable() { - public void run() { - platform.getScreen().swapBuffers(); - } - }; + private Runnable renderEndNotifier = () -> platform.getScreen().swapBuffers(); MonocleApplication() { for (InputDevice device : platform.getInputDeviceRegistry().getInputDevices()) { updateDeviceFlags(device, true); } platform.getInputDeviceRegistry().getInputDevices().addListener( - new SetChangeListener() { - @Override - public void onChanged( - Change change) { - if (change.wasAdded()) { - InputDevice device = change.getElementAdded(); - updateDeviceFlags(device, true); - } else if (change.wasRemoved()) { - InputDevice device = change.getElementRemoved(); - updateDeviceFlags(device, false); + (SetChangeListener) change -> { + if (change.wasAdded()) { + InputDevice device = change.getElementAdded(); + updateDeviceFlags(device, true); + } else if (change.wasRemoved()) { + InputDevice device = change.getElementRemoved(); + updateDeviceFlags(device, false); + } } - } - }); + ); } private void updateDeviceFlags(InputDevice device, boolean added) { diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleRobot.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleRobot.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleRobot.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleRobot.java @@ -47,103 +47,85 @@ @Override protected void _keyPress(int code) { - Platform.runLater(new Runnable() { - @Override - public void run() { - KeyState state = new KeyState(); - KeyInput.getInstance().getState(state); - state.pressKey(code); - KeyInput.getInstance().setState(state); - } + Platform.runLater(() -> { + KeyState state = new KeyState(); + KeyInput.getInstance().getState(state); + state.pressKey(code); + KeyInput.getInstance().setState(state); }); } @Override protected void _keyRelease(int code) { - Platform.runLater(new Runnable() { - @Override - public void run() { - KeyState state = new KeyState(); - KeyInput.getInstance().getState(state); - state.releaseKey(code); - KeyInput.getInstance().setState(state); - } + Platform.runLater(() -> { + KeyState state = new KeyState(); + KeyInput.getInstance().getState(state); + state.releaseKey(code); + KeyInput.getInstance().setState(state); }); } @Override protected void _mouseMove(int x, int y) { - Platform.runLater(new Runnable() { - @Override - public void run() { - MouseState state = new MouseState(); - MouseInput.getInstance().getState(state); - state.setX(x); - state.setY(y); - MouseInput.getInstance().setState(state, false); - } + Platform.runLater(() -> { + MouseState state = new MouseState(); + MouseInput.getInstance().getState(state); + state.setX(x); + state.setY(y); + MouseInput.getInstance().setState(state, false); }); } @Override protected void _mousePress(int buttons) { - Platform.runLater(new Runnable() { - @Override - public void run() { - MouseState state = new MouseState(); - MouseInput.getInstance().getState(state); - if ((buttons & MOUSE_LEFT_BTN) != 0) { - state.pressButton(MouseEvent.BUTTON_LEFT); - } - if ((buttons & MOUSE_MIDDLE_BTN) != 0) { - state.pressButton(MouseEvent.BUTTON_OTHER); - } - if ((buttons & MOUSE_RIGHT_BTN) != 0) { - state.pressButton(MouseEvent.BUTTON_RIGHT); - } - MouseInput.getInstance().setState(state, false); + Platform.runLater(() -> { + MouseState state = new MouseState(); + MouseInput.getInstance().getState(state); + if ((buttons & MOUSE_LEFT_BTN) != 0) { + state.pressButton(MouseEvent.BUTTON_LEFT); } + if ((buttons & MOUSE_MIDDLE_BTN) != 0) { + state.pressButton(MouseEvent.BUTTON_OTHER); + } + if ((buttons & MOUSE_RIGHT_BTN) != 0) { + state.pressButton(MouseEvent.BUTTON_RIGHT); + } + MouseInput.getInstance().setState(state, false); }); } @Override protected void _mouseRelease(int buttons) { - Platform.runLater(new Runnable() { - @Override - public void run() { - MouseState state = new MouseState(); - MouseInput.getInstance().getState(state); - if ((buttons & MOUSE_LEFT_BTN) != 0) { - state.releaseButton(MouseEvent.BUTTON_LEFT); - } - if ((buttons & MOUSE_MIDDLE_BTN) != 0) { - state.releaseButton(MouseEvent.BUTTON_OTHER); - } - if ((buttons & MOUSE_RIGHT_BTN) != 0) { - state.releaseButton(MouseEvent.BUTTON_RIGHT); - } - MouseInput.getInstance().setState(state, false); + Platform.runLater(() -> { + MouseState state = new MouseState(); + MouseInput.getInstance().getState(state); + if ((buttons & MOUSE_LEFT_BTN) != 0) { + state.releaseButton(MouseEvent.BUTTON_LEFT); } + if ((buttons & MOUSE_MIDDLE_BTN) != 0) { + state.releaseButton(MouseEvent.BUTTON_OTHER); + } + if ((buttons & MOUSE_RIGHT_BTN) != 0) { + state.releaseButton(MouseEvent.BUTTON_RIGHT); + } + MouseInput.getInstance().setState(state, false); }); } @Override protected void _mouseWheel(int wheelAmt) { - Platform.runLater(new Runnable() { - @Override - public void run() { - MouseState state = new MouseState(); - MouseInput mouse = MouseInput.getInstance(); - mouse.getState(state); - int direction = wheelAmt < 0 - ? MouseState.WHEEL_DOWN - : MouseState.WHEEL_UP; - for (int i = 0; i < Math.abs(wheelAmt); i++) { - state.setWheel(direction); - mouse.setState(state, false); - state.setWheel(MouseState.WHEEL_NONE); - mouse.setState(state, false); - } + Platform.runLater(() -> { + MouseState state = new MouseState(); + MouseInput mouse = MouseInput.getInstance(); + mouse.getState(state); + int direction = wheelAmt < 0 + ? MouseState.WHEEL_DOWN + : MouseState.WHEEL_UP; + for (int i = 0; i < Math.abs(wheelAmt); i++) { + state.setWheel(direction); + mouse.setState(state, false); + state.setWheel(MouseState.WHEEL_NONE); + mouse.setState(state, false); } }); } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleSettings.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleSettings.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleSettings.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleSettings.java @@ -29,12 +29,7 @@ public class MonocleSettings { public static final MonocleSettings settings = AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public MonocleSettings run() { - return new MonocleSettings(); - } - }); + (PrivilegedAction) () -> new MonocleSettings()); public final boolean traceEvents; public final boolean traceEventsVerbose; diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/NativePlatformFactory.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/NativePlatformFactory.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/NativePlatformFactory.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/NativePlatformFactory.java @@ -39,13 +39,8 @@ public static synchronized NativePlatform getNativePlatform() { if (platform == null) { String platformFactoryProperty = - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public String run() { - return System.getProperty("monocle.platform", - "MX6,OMAP,Dispman,Linux,Headless"); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("monocle.platform", + "MX6,OMAP,Dispman,Linux,Headless")); String[] platformFactories = platformFactoryProperty.split(","); for (int i = 0; i < platformFactories.length; i++) { String factoryName = platformFactories[i].trim(); diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/RunnableProcessor.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/RunnableProcessor.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/RunnableProcessor.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/RunnableProcessor.java @@ -53,14 +53,11 @@ public void invokeAndWait(final Runnable r) { final CountDownLatch latch = new CountDownLatch(1); - queue.postRunnable(new Runnable() { - @Override - public void run() { - try { - r.run(); - } finally { - latch.countDown(); - } + queue.postRunnable(() -> { + try { + r.run(); + } finally { + latch.countDown(); } }); try { diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/headless/HeadlessScreen.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/headless/HeadlessScreen.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/headless/HeadlessScreen.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/headless/HeadlessScreen.java @@ -54,12 +54,7 @@ this.width = defaultWidth; this.height = defaultHeight; this.depth = defaultDepth; - String geometry = AccessController.doPrivileged(new PrivilegedAction() { - @Override - public String run() { - return System.getProperty("headless.geometry"); - } - }); + String geometry = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("headless.geometry")); if (geometry != null && geometry.indexOf('x') > 0) { try { int i = geometry.indexOf("x"); diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/input/KeyInput.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/input/KeyInput.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/input/KeyInput.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/input/KeyInput.java @@ -76,14 +76,11 @@ } else if (key == KeyEvent.VK_NUM_LOCK) { numLock = !numLock; } else if (key == KeyEvent.VK_C && newState.isControlPressed()) { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if ("1".equals(System.getenv("JAVAFX_DEBUG"))) { - System.exit(0); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if ("1".equals(System.getenv("JAVAFX_DEBUG"))) { + System.exit(0); } + return null; }); } dispatchKeyEvent(newState, KeyEvent.PRESS, key); diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/input/TouchInput.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/input/TouchInput.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/input/TouchInput.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/input/TouchInput.java @@ -51,13 +51,9 @@ * filtered out.The value of the property is in pixels. */ private final int touchRadius = AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public Integer run() { - return Integer.getInteger( - "monocle.input.touchRadius", 20); - } - }); + (PrivilegedAction) () -> Integer.getInteger( + "monocle.input.touchRadius", 20) + ); private static TouchInput instance = new TouchInput(); private TouchPipeline basePipeline; @@ -79,14 +75,10 @@ if (basePipeline == null) { basePipeline = new TouchPipeline(); String[] touchFilterNames = AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public String run() { - return System.getProperty( - "monocle.input.touchFilters", - "SmallMove"); - } - }).split(","); + (PrivilegedAction) () -> System.getProperty( + "monocle.input.touchFilters", + "SmallMove") + ).split(","); if (touchFilterNames != null) { for (String touchFilterName : touchFilterNames) { basePipeline.addNamedFilter(touchFilterName.trim()); diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/input/TouchState.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/input/TouchState.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/input/TouchState.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/input/TouchState.java @@ -47,12 +47,7 @@ } } - static Comparator pointIdComparator = new Comparator() { - @Override - public int compare(Point p1, Point p2) { - return p1.id - p2.id; - } - }; + static Comparator pointIdComparator = (p1, p2) -> p1.id - p2.id; private Point[] points = new Point[1]; private int pointCount = 0; diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/GetEvent.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/GetEvent.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/GetEvent.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/GetEvent.java @@ -45,54 +45,51 @@ private static Set devices = new HashSet<>(); - private static UdevListener udevListener = new UdevListener() { - @Override - public void udevEvent(String action, Map event) { - String subsystem = event.get("SUBSYSTEM"); - String devPath = event.get("DEVPATH"); - if (subsystem != null && subsystem.equals("input") - && devPath != null) { + private static UdevListener udevListener = (action, event) -> { + String subsystem = event.get("SUBSYSTEM"); + String devPath = event.get("DEVPATH"); + if (subsystem != null && subsystem.equals("input") + && devPath != null) { - // show the udev event properties - System.out.format("%1$ts.%1$tL Received UEVENT:\n", - new Date()); - List keys = new ArrayList<>(event.keySet()); - Collections.sort(keys); - for (String key: keys) { - System.out.format(" %s='%s'\n", key, event.get(key)); + // show the udev event properties + System.out.format("%1$ts.%1$tL Received UEVENT:\n", + new Date()); + List keys = new ArrayList<>(event.keySet()); + Collections.sort(keys); + for (String key: keys) { + System.out.format(" %s='%s'\n", key, event.get(key)); + } + + // process the event + try { + File sysPath = new File("/sys", devPath); + String devNode = event.get("DEVNAME"); + if (devNode == null) { + return; } - - // process the event - try { - File sysPath = new File("/sys", devPath); - String devNode = event.get("DEVNAME"); - if (devNode == null) { - return; - } - if (action.equals("add") - || (action.equals("change") - && !devices.contains(sysPath))) { - LinuxInputDevice device = new LinuxInputDevice( - new File(devNode), sysPath, event); - device.setInputProcessor(new LinuxInputProcessor.Logger()); - Thread thread = new Thread(device); - thread.setName(devNode.toString()); - thread.setDaemon(true); - thread.start(); - System.out.println("Added device " + devNode); - System.out.println(" touch=" + device.isTouch()); - System.out.println(" multiTouch=" + device.isMultiTouch()); - System.out.println(" relative=" + device.isRelative()); - System.out.println(" 5-way=" + device.is5Way()); - System.out.println(" fullKeyboard=" + device.isFullKeyboard()); - System.out.println(" PRODUCT=" + device.getProduct()); - devices.add(sysPath); - } else if (action.equals("remove")) { - devices.remove(devPath); - } - } catch (IOException | RuntimeException e) { - e.printStackTrace(); + if (action.equals("add") + || (action.equals("change") + && !devices.contains(sysPath))) { + LinuxInputDevice device = new LinuxInputDevice( + new File(devNode), sysPath, event); + device.setInputProcessor(new LinuxInputProcessor.Logger()); + Thread thread = new Thread(device); + thread.setName(devNode.toString()); + thread.setDaemon(true); + thread.start(); + System.out.println("Added device " + devNode); + System.out.println(" touch=" + device.isTouch()); + System.out.println(" multiTouch=" + device.isMultiTouch()); + System.out.println(" relative=" + device.isRelative()); + System.out.println(" 5-way=" + device.is5Way()); + System.out.println(" fullKeyboard=" + device.isFullKeyboard()); + System.out.println(" PRODUCT=" + device.getProduct()); + devices.add(sysPath); + } else if (action.equals("remove")) { + devices.remove(devPath); } + } catch (IOException | RuntimeException e) { + e.printStackTrace(); } } }; diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxInputDeviceRegistry.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxInputDeviceRegistry.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxInputDeviceRegistry.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxInputDeviceRegistry.java @@ -42,35 +42,32 @@ return; } Map deviceMap = new HashMap<>(); - UdevListener udevListener = new UdevListener() { - @Override - public void udevEvent(String action, Map event) { - String subsystem = event.get("SUBSYSTEM"); - String devPath = event.get("DEVPATH"); - String devName = event.get("DEVNAME"); - if (subsystem != null && subsystem.equals("input") - && devPath != null && devName != null) { - try { - File sysPath = new File("/sys", devPath); - if (action.equals("add") - || (action.equals("change") - && !deviceMap.containsKey(sysPath))) { - File devNode = new File(devName); - LinuxInputDevice device = createDevice( - devNode, sysPath, event); - if (device != null) { - deviceMap.put(sysPath, device); - } - } else if (action.equals("remove")) { - LinuxInputDevice device = deviceMap.get(devPath); - deviceMap.remove(devPath); - if (device != null) { - devices.remove(device); - } + UdevListener udevListener = (action, event) -> { + String subsystem = event.get("SUBSYSTEM"); + String devPath = event.get("DEVPATH"); + String devName = event.get("DEVNAME"); + if (subsystem != null && subsystem.equals("input") + && devPath != null && devName != null) { + try { + File sysPath = new File("/sys", devPath); + if (action.equals("add") + || (action.equals("change") + && !deviceMap.containsKey(sysPath))) { + File devNode = new File(devName); + LinuxInputDevice device = createDevice( + devNode, sysPath, event); + if (device != null) { + deviceMap.put(sysPath, device); } - } catch (IOException e) { - e.printStackTrace(); + } else if (action.equals("remove")) { + LinuxInputDevice device = deviceMap.get(devPath); + deviceMap.remove(devPath); + if (device != null) { + devices.remove(device); + } } + } catch (IOException e) { + e.printStackTrace(); } } }; diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxPlatformFactory.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxPlatformFactory.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxPlatformFactory.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxPlatformFactory.java @@ -36,12 +36,7 @@ @Override protected boolean matches() { String os = AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public String run() { - return System.getProperty("os.name"); - } - }); + (PrivilegedAction) () -> System.getProperty("os.name")); return os != null && os.equals("Linux"); } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxTouchProcessor.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxTouchProcessor.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxTouchProcessor.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxTouchProcessor.java @@ -39,15 +39,10 @@ LinuxTouchProcessor(LinuxInputDevice device) { transform = new LinuxTouchTransform(device); PrivilegedAction getFilterProperty = - new PrivilegedAction() { - @Override - public String run() { - return System.getProperty( - "monocle.input." + device.getProduct() - + ".touchFilters", - ""); - } - }; + () -> System.getProperty( + "monocle.input." + device.getProduct() + + ".touchFilters", + ""); pipeline = new TouchPipeline(); pipeline.addNamedFilters( AccessController.doPrivileged(getFilterProperty)); diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxTouchTransform.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxTouchTransform.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxTouchTransform.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/linux/LinuxTouchTransform.java @@ -58,13 +58,10 @@ this.device = device; Arrays.fill(axes, -1); String product = device.getProduct(); - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - flipXY = Boolean.getBoolean("monocle.input." - + product + ".flipXY"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + flipXY = Boolean.getBoolean("monocle.input." + + product + ".flipXY"); + return null; }); } @@ -143,19 +140,16 @@ } AbsoluteInputCapabilities caps = device.getAbsoluteInputCapabilities(axis); String product = device.getProduct(); - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - int minimum = Integer.getInteger( - "monocle.input." + product + ".min" + axisName, - caps.getMinimum()); - int maximum = Integer.getInteger( - "monocle.input." + product + ".max" + axisName, - caps.getMaximum()); - translates[index] = -minimum; - scalars[index] = ((double) (range)) / (maximum - minimum); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + int minimum = Integer.getInteger( + "monocle.input." + product + ".min" + axisName, + caps.getMinimum()); + int maximum = Integer.getInteger( + "monocle.input." + product + ".max" + axisName, + caps.getMaximum()); + translates[index] = -minimum; + scalars[index] = ((double) (range)) / (maximum - minimum); + return null; }); } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/vnc/VNCScreen.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/vnc/VNCScreen.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/vnc/VNCScreen.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/vnc/VNCScreen.java @@ -241,21 +241,18 @@ buffer.clear(); buffer.limit(6); socket.read(buffer); - Platform.runLater(new Runnable() { - @Override - public void run() { - try { - if (fb.hasReceivedData()) { - // an update is in progress and will - // be sent on the next call to - // swapBuffers. No need to - // respond to this request. - } else { - sendBuffer(socket); - } - } catch (IOException e) { - removeClient(ClientConnection.this, e); + Platform.runLater(() -> { + try { + if (fb.hasReceivedData()) { + // an update is in progress and will + // be sent on the next call to + // swapBuffers. No need to + // respond to this request. + } else { + sendBuffer(socket); } + } catch (IOException e) { + removeClient(ClientConnection.this, e); } }); break; @@ -285,12 +282,7 @@ if (buttons.get(2)) { state.pressButton(MouseEvent.BUTTON_RIGHT); } - Platform.runLater(new Runnable() { - @Override - public void run() { - MouseInput.getInstance().setState(state, false); - } - }); + Platform.runLater(() -> MouseInput.getInstance().setState(state, false)); break; } case 6: // ClientCutText diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/x11/X11InputDeviceRegistry.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/x11/X11InputDeviceRegistry.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/x11/X11InputDeviceRegistry.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/x11/X11InputDeviceRegistry.java @@ -65,29 +65,25 @@ return false; } }; - Thread x11InputThread = new Thread(new Runnable() { - public void run() { - NativePlatform platform = - NativePlatformFactory.getNativePlatform(); - X11Screen screen = (X11Screen) platform.getScreen(); - long display = screen.getDisplay(); - long window = screen.getNativeHandle(); - RunnableProcessor runnableProcessor = - platform.getRunnableProcessor(); - runnableProcessor.invokeLater(new Runnable() { - public void run() { - devices.add(device); - } - }); - state = new MouseState(); - X.XEvent event = new X.XEvent(); - while (true) { - X.XNextEvent(display, event.p); - if (X.XEvent.getWindow(event.p) != window) { - continue; - } - processXEvent(event, runnableProcessor); + Thread x11InputThread = new Thread(() -> { + NativePlatform platform = + NativePlatformFactory.getNativePlatform(); + X11Screen screen = (X11Screen) platform.getScreen(); + long display = screen.getDisplay(); + long window = screen.getNativeHandle(); + RunnableProcessor runnableProcessor = + platform.getRunnableProcessor(); + runnableProcessor.invokeLater(() -> { + devices.add(device); + }); + state = new MouseState(); + X.XEvent event = new X.XEvent(); + while (true) { + X.XNextEvent(display, event.p); + if (X.XEvent.getWindow(event.p) != window) { + continue; } + processXEvent(event, runnableProcessor); } }); x11InputThread.setName("X11 Input"); diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/x11/X11Screen.java b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/x11/X11Screen.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/x11/X11Screen.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/x11/X11Screen.java @@ -62,12 +62,7 @@ int y = 0; int w = X.WidthOfScreen(screen); int h = X.HeightOfScreen(screen); - String geometry = AccessController.doPrivileged(new PrivilegedAction() { - @Override - public String run() { - return System.getProperty("x11.geometry"); - } - }); + String geometry = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("x11.geometry")); if (geometry != null) { try { String size; diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTApplication.java b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTApplication.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTApplication.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTApplication.java @@ -175,11 +175,7 @@ runCocoaLoop(launchable); } else { // the current thread can't block as the caller is waiting on it - new Thread(new Runnable() { - @Override public void run() { - runSWTEventLoop(launchable); - } - }).start(); + new Thread(() -> runSWTEventLoop(launchable)).start(); } } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTClipboard.java b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTClipboard.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTClipboard.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTClipboard.java @@ -72,11 +72,7 @@ if (clipboard == null) { clipboard = new org.eclipse.swt.dnd.Clipboard(display); display.setData(CLIPBOARD_KEY, clipboard); - display.disposeExec(new Runnable() { - public void run () { - clipboard.dispose(); - } - }); + display.disposeExec(() -> clipboard.dispose()); } } } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTCursor.java b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTCursor.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTCursor.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTCursor.java @@ -45,11 +45,7 @@ Display display = Display.getDefault(); ImageData data = SWTApplication.createImageData(pixels); cursor = new org.eclipse.swt.graphics.Cursor(display, data, x, y); - display.disposeExec(new Runnable() { - public void run () { - cursor.dispose(); - } - }); + display.disposeExec(() -> cursor.dispose()); return 1L; } } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTMenuDelegate.java b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTMenuDelegate.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTMenuDelegate.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTMenuDelegate.java @@ -101,11 +101,9 @@ public boolean setCallback(final MenuItem.Callback callback) { this.callback = callback; if (item != null) { - item.addListener(SWT.Selection, new Listener () { - public void handleEvent(Event event) { - item.setSelection(false); - callback.action(); - } + item.addListener(SWT.Selection, event -> { + item.setSelection(false); + callback.action(); }); } return true; @@ -158,15 +156,13 @@ ((SWTMenuDelegate)menu).setTitle(((SWTMenuDelegate)menu).title); ((SWTMenuDelegate)menu).setPixels(((SWTMenuDelegate)menu).pixels); ((SWTMenuDelegate)menu).setEnabled(((SWTMenuDelegate)menu).enabled); - ((SWTMenuDelegate)menu).item.addListener(SWT.Dispose, new Listener() { - public void handleEvent(Event event) { - Image oldImage = ((SWTMenuDelegate)menu).item.getImage(); - if (oldImage != null) { - ((SWTMenuDelegate)menu).item.setImage(null); - oldImage.dispose(); - } - ((SWTMenuDelegate)menu).item = null; + ((SWTMenuDelegate)menu).item.addListener(SWT.Dispose, event -> { + Image oldImage = ((SWTMenuDelegate)menu).item.getImage(); + if (oldImage != null) { + ((SWTMenuDelegate)menu).item.setImage(null); + oldImage.dispose(); } + ((SWTMenuDelegate)menu).item = null; }); return true; } @@ -176,15 +172,13 @@ new org.eclipse.swt.widgets.MenuItem(this.menu, SWT.SEPARATOR, pos); } else { ((SWTMenuDelegate)item).item = new org.eclipse.swt.widgets.MenuItem(this.menu, SWT.CHECK, pos); - ((SWTMenuDelegate)item).item.addListener(SWT.Dispose, new Listener() { - public void handleEvent(Event event) { - Image oldImage = ((SWTMenuDelegate)item).item.getImage(); - if (oldImage != null) { - ((SWTMenuDelegate)item).item.setImage(null); - oldImage.dispose(); - } - ((SWTMenuDelegate)item).item = null; + ((SWTMenuDelegate)item).item.addListener(SWT.Dispose, event -> { + Image oldImage = ((SWTMenuDelegate)item).item.getImage(); + if (oldImage != null) { + ((SWTMenuDelegate)item).item.setImage(null); + oldImage.dispose(); } + ((SWTMenuDelegate)item).item = null; }); ((SWTMenuDelegate)item).setTitle(((SWTMenuDelegate)item).title); ((SWTMenuDelegate)item).setPixels(((SWTMenuDelegate)item).pixels); diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTTimer.java b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTTimer.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTTimer.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTTimer.java @@ -59,17 +59,13 @@ display.timerExec(period, this); }; }; - display.asyncExec(new Runnable () { - public void run() { - display.timerExec(period, timerRunnable); - display.addListener(SWT.Dispose, new Listener () { - public void handleEvent (Event e) { - if (timerRunnable == null) return; - display.timerExec(-1, timerRunnable); - timerRunnable = null; - } - }); - } + display.asyncExec(() -> { + display.timerExec(period, timerRunnable); + display.addListener(SWT.Dispose, e -> { + if (timerRunnable == null) return; + display.timerExec(-1, timerRunnable); + timerRunnable = null; + }); }); return 1; } @@ -83,12 +79,10 @@ return; } final Display display = Display.getDefault(); - display.asyncExec(new Runnable () { - public void run() { - if (timerRunnable == null) return; - display.timerExec(-1, timerRunnable); - timerRunnable = null; - } + display.asyncExec(() -> { + if (timerRunnable == null) return; + display.timerExec(-1, timerRunnable); + timerRunnable = null; }); } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTView.java b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTView.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTView.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTView.java @@ -52,11 +52,9 @@ @Override protected long _create(Map caps) { if (hiddenShell == null) { hiddenShell = new Shell(Display.getDefault(), SWT.SHELL_TRIM); - Display.getDefault().disposeExec(new Runnable () { - public void run () { - hiddenShell.dispose(); - hiddenShell = null; - } + Display.getDefault().disposeExec(() -> { + hiddenShell.dispose(); + hiddenShell = null; }); } int bits = SWT.NO_BACKGROUND | SWT.NO_REDRAW_RESIZE | SWT.LEFT_TO_RIGHT;// | SWT.NO_FOCUS; @@ -70,11 +68,7 @@ canvas = new Canvas(hiddenShell, bits); } canvas.setData(this); - Listener keyListener = new Listener () { - public void handleEvent(Event event) { - sendKeyEvent(event); - } - }; + Listener keyListener = event -> sendKeyEvent(event); int [] keyEvents = new int[] { SWT.KeyDown, SWT.KeyUp, @@ -82,11 +76,7 @@ for (int i=0; i sendMouseEvent(event); int [] mouseEvents = new int[] { SWT.MouseDown, SWT.MouseUp, @@ -100,16 +90,10 @@ for (int i=0; i notifyRepaint(event.x, event.y, event.width, event.height)); + canvas.addListener(SWT.Resize, event -> { + Rectangle rect = canvas.getClientArea(); + notifyResize(rect.width, rect.height); }); //TODO - refactor to drop target creation in a better place diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTWindow.java b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTWindow.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTWindow.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/swt/SWTWindow.java @@ -82,11 +82,7 @@ SWT.Resize, SWT.Dispose, }; - Listener shellListener = new Listener () { - public void handleEvent(Event event) { - handleShellEvent (event); - } - }; + Listener shellListener = event -> handleShellEvent (event); for (int i=0; i { + Rectangle rect = shell.getBounds(); + if (xSet) rect.x = x; + if (ySet) rect.y = y; + boolean hSet = false, wSet = false; + //TODO - check that this is the right way to process w, h, cw, ch + if (w != -1) { + wSet = true; + rect.width = w; + } else { + if (cw != -1) { wSet = true; - rect.width = w; - } else { - if (cw != -1) { - wSet = true; - rect.width = cw; - } + rect.width = cw; } - if (h != -1) { + } + if (h != -1) { + hSet = true; + rect.height = h; + } else { + if (ch != -1) { hSet = true; - rect.height = h; - } else { - if (ch != -1) { - hSet = true; - rect.height = ch; - } + rect.height = ch; } - if (wSet || hSet) { - Rectangle bounds= shell.computeTrim(rect.x, rect.y, rect.width, rect.height); - shell.setBounds(rect.x, rect.y, bounds.width, bounds.height); - } else { - shell.setLocation(rect.x, rect.y); - } + } + if (wSet || hSet) { + Rectangle bounds= shell.computeTrim(rect.x, rect.y, rect.width, rect.height); + shell.setBounds(rect.x, rect.y, bounds.width, bounds.height); + } else { + shell.setLocation(rect.x, rect.y); } }); } @@ -241,15 +235,13 @@ @Override protected boolean _setVisible(long ptr, final boolean visible) { //TODO - using syncExec because of applet - shell.getDisplay().syncExec(new Runnable() { - @Override public void run() { - if ((shell.getStyle() & SWT.NO_FOCUS) != 0) { - shell.setVisible(visible); - } else { - shell.open(); - //TODO - explicitly setting focus should not be necessary - shell.setFocus(); - } + shell.getDisplay().syncExec(() -> { + if ((shell.getStyle() & SWT.NO_FOCUS) != 0) { + shell.setVisible(visible); + } else { + shell.open(); + //TODO - explicitly setting focus should not be necessary + shell.setFocus(); } }); return true; diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/swt/swtPlatformFactory.java b/modules/graphics/src/main/java/com/sun/glass/ui/swt/swtPlatformFactory.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/swt/swtPlatformFactory.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/swt/swtPlatformFactory.java @@ -55,16 +55,14 @@ } public ClipboardDelegate createClipboardDelegate() { - return new ClipboardDelegate() { - public Clipboard createClipboard(String clipboardName) { - if (Clipboard.SYSTEM.equals(clipboardName)) { - return new SWTClipboard(clipboardName); - } - if (Clipboard.DND.equals(clipboardName)) { - return new SWTClipboard(clipboardName); - } - return null; + return clipboardName -> { + if (Clipboard.SYSTEM.equals(clipboardName)) { + return new SWTClipboard(clipboardName); } + if (Clipboard.DND.equals(clipboardName)) { + return new SWTClipboard(clipboardName); + } + return null; }; } diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java b/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java @@ -65,12 +65,7 @@ private final InvokeLaterDispatcher invokeLaterDispatcher; WinApplication() { boolean isEventThread = AccessController - .doPrivileged(new PrivilegedAction() { - public Boolean run() { - // Embedded in SWT, with shared event thread - return Boolean.getBoolean("javafx.embed.isEventThread"); - } - }); + .doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.embed.isEventThread")); if (!isEventThread) { invokeLaterDispatcher = new InvokeLaterDispatcher(this); invokeLaterDispatcher.start(); @@ -90,11 +85,7 @@ @Override protected void runLoop(final Runnable launchable) { boolean isEventThread = AccessController - .doPrivileged(new PrivilegedAction() { - public Boolean run() { - return Boolean.getBoolean("javafx.embed.isEventThread"); - } - }); + .doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.embed.isEventThread")); ClassLoader classLoader = WinApplication.class.getClassLoader(); _setClassLoader(classLoader); @@ -106,16 +97,10 @@ return; } final Thread toolkitThread = - AccessController.doPrivileged(new PrivilegedAction() { - public Thread run() { - return new Thread(new Runnable() { - public void run() { - _init(); - _runLoop(launchable); - } - }, "WindowsNativeRunloopThread"); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> new Thread(() -> { + _init(); + _runLoop(launchable); + }, "WindowsNativeRunloopThread")); setEventThread(toolkitThread); toolkitThread.start(); } @@ -286,11 +271,7 @@ public String getDataDirectory() { checkEventThread(); - String baseDirectory = AccessController.doPrivileged(new PrivilegedAction() { - @Override public String run() { - return System.getenv("APPDATA"); - } - }); + String baseDirectory = AccessController.doPrivileged((PrivilegedAction) () -> System.getenv("APPDATA")); if (baseDirectory == null || baseDirectory.length() == 0) { return super.getDataDirectory(); } diff --git a/modules/graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java b/modules/graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java --- a/modules/graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java +++ b/modules/graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java @@ -48,11 +48,9 @@ private static String libSuffix = ""; static { - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - verbose = Boolean.getBoolean("javafx.verbose"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + verbose = Boolean.getBoolean("javafx.verbose"); + return null; }); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/application/HostServicesDelegate.java b/modules/graphics/src/main/java/com/sun/javafx/application/HostServicesDelegate.java --- a/modules/graphics/src/main/java/com/sun/javafx/application/HostServicesDelegate.java +++ b/modules/graphics/src/main/java/com/sun/javafx/application/HostServicesDelegate.java @@ -43,31 +43,26 @@ HostServicesDelegate instance = null; try { instance = AccessController.doPrivileged( - new PrivilegedExceptionAction() { - @Override - public HostServicesDelegate run() - throws NoSuchMethodException, IllegalAccessException, - InvocationTargetException, ExceptionInInitializerError, - InstantiationException { - if (getInstanceMeth == null) { - try { - final String factoryClassName = - "com.sun.deploy.uitoolkit.impl.fx.HostServicesFactory"; + (PrivilegedExceptionAction) () -> { + if (getInstanceMeth == null) { + try { + final String factoryClassName = + "com.sun.deploy.uitoolkit.impl.fx.HostServicesFactory"; - Class factoryClass = Class.forName(factoryClassName, - true, - HostServicesDelegate.class.getClassLoader()); - getInstanceMeth = factoryClass.getMethod( - "getInstance", Application.class); - } catch (Exception ex) { - ex.printStackTrace(); - return null; + Class factoryClass = Class.forName(factoryClassName, + true, + HostServicesDelegate.class.getClassLoader()); + getInstanceMeth = factoryClass.getMethod( + "getInstance", Application.class); + } catch (Exception ex) { + ex.printStackTrace(); + return null; + } } + return (HostServicesDelegate) + getInstanceMeth.invoke(null, app); } - return (HostServicesDelegate) - getInstanceMeth.invoke(null, app); - } - }); + ); } catch (PrivilegedActionException pae) { System.err.println(pae.getException().toString()); return null; diff --git a/modules/graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java b/modules/graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java --- a/modules/graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java +++ b/modules/graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java @@ -152,21 +152,19 @@ // Create a new Launcher thread and then wait for that thread to finish final CountDownLatch launchLatch = new CountDownLatch(1); - Thread launcherThread = new Thread(new Runnable() { - @Override public void run() { - try { - launchApplication1(appClass, preloaderClass, args); - } catch (RuntimeException rte) { - launchException = rte; - } catch (Exception ex) { - launchException = - new RuntimeException("Application launch exception", ex); - } catch (Error err) { - launchException = - new RuntimeException("Application launch error", err); - } finally { - launchLatch.countDown(); - } + Thread launcherThread = new Thread(() -> { + try { + launchApplication1(appClass, preloaderClass, args); + } catch (RuntimeException rte) { + launchException = rte; + } catch (Exception ex) { + launchException = + new RuntimeException("Application launch exception", ex); + } catch (Error err) { + launchException = + new RuntimeException("Application launch error", err); + } finally { + launchLatch.countDown(); } }); launcherThread.setName("JavaFX-Launcher"); @@ -323,28 +321,26 @@ final ClassLoader loader = Thread.currentThread().getContextClassLoader(); final AtomicReference> tmpClassRef = new AtomicReference<>(); final AtomicReference> preClassRef = new AtomicReference<>(); - PlatformImpl.runAndWait(new Runnable() { - @Override public void run() { - Class clz = null; + PlatformImpl.runAndWait(() -> { + Class clz = null; + try { + clz = Class.forName(mainClassName, true, loader); + } catch (ClassNotFoundException cnfe) { + abort(cnfe, "Missing JavaFX application class %1$s", mainClassName); + } + tmpClassRef.set(clz); + + if (preloaderClassName != null) { try { - clz = Class.forName(mainClassName, true, loader); + clz = Class.forName(preloaderClassName, true, loader); } catch (ClassNotFoundException cnfe) { - abort(cnfe, "Missing JavaFX application class %1$s", mainClassName); + abort(cnfe, "Missing JavaFX preloader class %1$s", preloaderClassName); } - tmpClassRef.set(clz); - if (preloaderClassName != null) { - try { - clz = Class.forName(preloaderClassName, true, loader); - } catch (ClassNotFoundException cnfe) { - abort(cnfe, "Missing JavaFX preloader class %1$s", preloaderClassName); - } - - if (!Preloader.class.isAssignableFrom(clz)) { - abort(null, "JavaFX preloader class %1$s does not extend javafx.application.Preloader", clz.getName()); - } - preClassRef.set(clz.asSubclass(Preloader.class)); + if (!Preloader.class.isAssignableFrom(clz)) { + abort(null, "JavaFX preloader class %1$s does not extend javafx.application.Preloader", clz.getName()); } + preClassRef.set(clz.asSubclass(Preloader.class)); } }); preClass = preClassRef.get(); @@ -650,12 +646,7 @@ } final CountDownLatch startupLatch = new CountDownLatch(1); - PlatformImpl.startup(new Runnable() { - // Note, this method is called on the FX Application Thread - @Override public void run() { - startupLatch.countDown(); - } - }); + PlatformImpl.startup(() -> startupLatch.countDown()); // Wait for FX platform to start startupLatch.await(); @@ -712,18 +703,16 @@ // Construct an instance of the preloader on the FX thread, then // call its init method on this (launcher) thread. Then call // the start method on the FX thread. - PlatformImpl.runAndWait(new Runnable() { - @Override public void run() { - try { - Constructor c = preloaderClass.getConstructor(); - pldr.set(c.newInstance()); - // Set startup parameters - ParametersImpl.registerParameters(pldr.get(), new ParametersImpl(args)); - } catch (Throwable t) { - System.err.println("Exception in Preloader constructor"); - pConstructorError = t; - error = true; - } + PlatformImpl.runAndWait(() -> { + try { + Constructor c = preloaderClass.getConstructor(); + pldr.set(c.newInstance()); + // Set startup parameters + ParametersImpl.registerParameters(pldr.get(), new ParametersImpl(args)); + } catch (Throwable t) { + System.err.println("Exception in Preloader constructor"); + pConstructorError = t; + error = true; } }); } @@ -744,20 +733,18 @@ // Call start method unless exit called or error detected if (currentPreloader != null && !error && !exitCalled.get()) { // Call the application start method on FX thread - PlatformImpl.runAndWait(new Runnable() { - @Override public void run() { - try { - pStartCalled.set(true); + PlatformImpl.runAndWait(() -> { + try { + pStartCalled.set(true); - // Create primary stage and call preloader start method - final Stage primaryStage = new Stage(); - primaryStage.impl_setPrimary(true); - currentPreloader.start(primaryStage); - } catch (Throwable t) { - System.err.println("Exception in Preloader start method"); - pStartError = t; - error = true; - } + // Create primary stage and call preloader start method + final Stage primaryStage = new Stage(); + primaryStage.impl_setPrimary(true); + currentPreloader.start(primaryStage); + } catch (Throwable t) { + System.err.println("Exception in Preloader start method"); + pStartError = t; + error = true; } }); @@ -784,19 +771,17 @@ StateChangeNotification.Type.BEFORE_LOAD, null); } - PlatformImpl.runAndWait(new Runnable() { - @Override public void run() { - try { - Constructor c = appClass.getConstructor(); - app.set(c.newInstance()); - // Set startup parameters - ParametersImpl.registerParameters(app.get(), new ParametersImpl(args)); - PlatformImpl.setApplicationName(appClass); - } catch (Throwable t) { - System.err.println("Exception in Application constructor"); - constructorError = t; - error = true; - } + PlatformImpl.runAndWait(() -> { + try { + Constructor c = appClass.getConstructor(); + app.set(c.newInstance()); + // Set startup parameters + ParametersImpl.registerParameters(app.get(), new ParametersImpl(args)); + PlatformImpl.setApplicationName(appClass); + } catch (Throwable t) { + System.err.println("Exception in Application constructor"); + constructorError = t; + error = true; } }); } @@ -826,20 +811,18 @@ StateChangeNotification.Type.BEFORE_START, theApp); } // Call the application start method on FX thread - PlatformImpl.runAndWait(new Runnable() { - @Override public void run() { - try { - startCalled.set(true); + PlatformImpl.runAndWait(() -> { + try { + startCalled.set(true); - // Create primary stage and call application start method - final Stage primaryStage = new Stage(); - primaryStage.impl_setPrimary(true); - theApp.start(primaryStage); - } catch (Throwable t) { - System.err.println("Exception in Application start method"); - startError = t; - error = true; - } + // Create primary stage and call application start method + final Stage primaryStage = new Stage(); + primaryStage.impl_setPrimary(true); + theApp.start(primaryStage); + } catch (Throwable t) { + System.err.println("Exception in Application start method"); + startError = t; + error = true; } }); } @@ -852,15 +835,13 @@ // Call stop method if start was called if (startCalled.get()) { // Call Application stop method on FX thread - PlatformImpl.runAndWait(new Runnable() { - @Override public void run() { - try { - theApp.stop(); - } catch (Throwable t) { - System.err.println("Exception in Application stop method"); - stopError = t; - error = true; - } + PlatformImpl.runAndWait(() -> { + try { + theApp.stop(); + } catch (Throwable t) { + System.err.println("Exception in Application stop method"); + stopError = t; + error = true; } }); } @@ -918,35 +899,25 @@ final StateChangeNotification.Type type, final Application app) { - PlatformImpl.runAndWait(new Runnable() { - @Override public void run() { - preloader.handleStateChangeNotification( - new Preloader.StateChangeNotification(type, app)); - } - }); + PlatformImpl.runAndWait(() -> preloader.handleStateChangeNotification( + new StateChangeNotification(type, app))); } private static void notifyProgress(final Preloader preloader, final double d) { - PlatformImpl.runAndWait(new Runnable() { - @Override public void run() { - preloader.handleProgressNotification( - new Preloader.ProgressNotification(d)); - } - }); + PlatformImpl.runAndWait(() -> preloader.handleProgressNotification( + new Preloader.ProgressNotification(d))); } private static boolean notifyError(final String msg, final Throwable constructorError) { final AtomicBoolean result = new AtomicBoolean(false); - PlatformImpl.runAndWait(new Runnable() { - @Override public void run() { - if (currentPreloader != null) { - try { - ErrorNotification evt = new ErrorNotification(null, msg, constructorError); - boolean rval = currentPreloader.handleErrorNotification(evt); - result.set(rval); - } catch (Throwable t) { - t.printStackTrace(); - } + PlatformImpl.runAndWait(() -> { + if (currentPreloader != null) { + try { + ErrorNotification evt = new ErrorNotification(null, msg, constructorError); + boolean rval = currentPreloader.handleErrorNotification(evt); + result.set(rval); + } catch (Throwable t) { + t.printStackTrace(); } } }); @@ -955,11 +926,9 @@ } private static void notifyCurrentPreloader(final PreloaderNotification pe) { - PlatformImpl.runAndWait(new Runnable() { - @Override public void run() { - if (currentPreloader != null) { - currentPreloader.handleApplicationNotification(pe); - } + PlatformImpl.runAndWait(() -> { + if (currentPreloader != null) { + currentPreloader.handleApplicationNotification(pe); } }); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java b/modules/graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java --- a/modules/graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java +++ b/modules/graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java @@ -114,11 +114,7 @@ * @param appClass the Application class. */ public static void setApplicationName(final Class appClass) { - runLater(new Runnable() { - @Override public void run() { - com.sun.glass.ui.Application.GetApplication().setName(appClass.getName()); - } - }); + runLater(() -> com.sun.glass.ui.Application.GetApplication().setName(appClass.getName())); } /** @@ -151,50 +147,46 @@ runLater(r); return; } - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Void run() { - contextual2DNavigation = Boolean.getBoolean( - "com.sun.javafx.isContextual2DNavigation"); - String s = System.getProperty("com.sun.javafx.twoLevelFocus"); - if (s != null) { - hasTwoLevelFocus = Boolean.valueOf(s); + AccessController.doPrivileged((PrivilegedAction) () -> { + contextual2DNavigation = Boolean.getBoolean( + "com.sun.javafx.isContextual2DNavigation"); + String s = System.getProperty("com.sun.javafx.twoLevelFocus"); + if (s != null) { + hasTwoLevelFocus = Boolean.valueOf(s); + } + s = System.getProperty("com.sun.javafx.virtualKeyboard"); + if (s != null) { + if (s.equalsIgnoreCase("none")) { + hasVirtualKeyboard = false; + } else if (s.equalsIgnoreCase("javafx")) { + hasVirtualKeyboard = true; + } else if (s.equalsIgnoreCase("native")) { + hasVirtualKeyboard = true; } - s = System.getProperty("com.sun.javafx.virtualKeyboard"); - if (s != null) { - if (s.equalsIgnoreCase("none")) { - hasVirtualKeyboard = false; - } else if (s.equalsIgnoreCase("javafx")) { - hasVirtualKeyboard = true; - } else if (s.equalsIgnoreCase("native")) { - hasVirtualKeyboard = true; - } - } - s = System.getProperty("com.sun.javafx.touch"); - if (s != null) { - hasTouch = Boolean.valueOf(s); - } - s = System.getProperty("com.sun.javafx.multiTouch"); - if (s != null) { - hasMultiTouch = Boolean.valueOf(s); - } - s = System.getProperty("com.sun.javafx.pointer"); - if (s != null) { - hasPointer = Boolean.valueOf(s); - } - s = System.getProperty("javafx.embed.singleThread"); - if (s != null) { - isThreadMerged = Boolean.valueOf(s); - } - return null; } + s = System.getProperty("com.sun.javafx.touch"); + if (s != null) { + hasTouch = Boolean.valueOf(s); + } + s = System.getProperty("com.sun.javafx.multiTouch"); + if (s != null) { + hasMultiTouch = Boolean.valueOf(s); + } + s = System.getProperty("com.sun.javafx.pointer"); + if (s != null) { + hasPointer = Boolean.valueOf(s); + } + s = System.getProperty("javafx.embed.singleThread"); + if (s != null) { + isThreadMerged = Boolean.valueOf(s); + } + return null; }); if (!taskbarApplication) { - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Void run() { - System.setProperty("glass.taskbarApplication", "false"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + System.setProperty("glass.taskbarApplication", "false"); + return null; }); } @@ -213,11 +205,9 @@ }; Toolkit.getToolkit().addTkListener(toolkitListener); - Toolkit.getToolkit().startup(new Runnable() { - @Override public void run() { - startupLatch.countDown(); - r.run(); - } + Toolkit.getToolkit().startup(() -> { + startupLatch.countDown(); + r.run(); }); //Initialize the thread merging mechanism @@ -292,20 +282,15 @@ final AccessControlContext acc = AccessController.getContext(); // Don't catch exceptions, they are handled by Toolkit.defer() - Toolkit.getToolkit().defer(new Runnable() { - @Override public void run() { - try { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - r.run(); - return null; - } - }, acc); - } finally { - pendingRunnables.decrementAndGet(); - checkIdle(); - } + Toolkit.getToolkit().defer(() -> { + try { + AccessController.doPrivileged((PrivilegedAction) () -> { + r.run(); + return null; + }, acc); + } finally { + pendingRunnables.decrementAndGet(); + checkIdle(); } }); } @@ -329,13 +314,11 @@ } } else { final CountDownLatch doneLatch = new CountDownLatch(1); - runLater(new Runnable() { - @Override public void run() { - try { - r.run(); - } finally { - doneLatch.countDown(); - } + runLater(() -> { + try { + r.run(); + } finally { + doneLatch.countDown(); } }, exiting); @@ -399,9 +382,7 @@ if (!isFxApplicationThread()) { // Add a dummy runnable to the runLater queue, which will then call // checkIdle() on the FX application thread. - runLater(new Runnable() { - @Override public void run() { - } + runLater(() -> { }); return; } @@ -431,10 +412,8 @@ lastWindowClosed = false; } else { // System.err.println("Queuing up a dummy idle check runnable"); - runLater(new Runnable() { - @Override public void run() { + runLater(() -> { // System.err.println("Dummy runnable"); - } }); } } @@ -459,12 +438,7 @@ if (initialized.get()) { // Always call toolkit exit on FX app thread // System.err.println("PlatformImpl.tkExit: scheduling Toolkit.exit"); - PlatformImpl.runAndWait(new Runnable() { - @Override public void run() { -// System.err.println("PlatformImpl.tkExit: calling Toolkit.exit"); - Toolkit.getToolkit().exit(); - } - }, true); + PlatformImpl.runAndWait(() -> Toolkit.getToolkit().exit(), true); if (isThreadMerged) { removeFwEventQueue(); @@ -559,11 +533,7 @@ if (isFxApplicationThread()) { _setPlatformUserAgentStylesheet(stylesheetUrl); } else { - runLater(new Runnable() { - @Override public void run() { - _setPlatformUserAgentStylesheet(stylesheetUrl); - } - }); + runLater(() -> _setPlatformUserAgentStylesheet(stylesheetUrl)); } } @@ -571,11 +541,7 @@ isModena = isCaspian = false; // check for command line override final String overrideStylesheetUrl = AccessController.doPrivileged( - new PrivilegedAction() { - @Override public String run() { - return System.getProperty("javafx.userAgentStylesheetUrl"); - } - }); + (PrivilegedAction) () -> System.getProperty("javafx.userAgentStylesheetUrl")); if (overrideStylesheetUrl != null) { stylesheetUrl = overrideStylesheetUrl; @@ -585,68 +551,62 @@ if (Application.STYLESHEET_CASPIAN.equalsIgnoreCase(stylesheetUrl)) { isCaspian = true; AccessController.doPrivileged( - new PrivilegedAction() { - @Override public Object run() { - StyleManager.getInstance().setDefaultUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/caspian.css"); + (PrivilegedAction) () -> { + StyleManager.getInstance().setDefaultUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/caspian.css"); - if (isSupported(ConditionalFeature.INPUT_TOUCH)) { - StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/embedded.css"); - if (com.sun.javafx.Utils.isQVGAScreen()) { - StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/embedded-qvga.css"); - } - if (PlatformUtil.isAndroid()) { - StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/android.css"); - } + if (isSupported(ConditionalFeature.INPUT_TOUCH)) { + StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/embedded.css"); + if (com.sun.javafx.Utils.isQVGAScreen()) { + StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/embedded-qvga.css"); } + if (PlatformUtil.isAndroid()) { + StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/android.css"); + } + } - if (isSupported(ConditionalFeature.TWO_LEVEL_FOCUS)) { - StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/two-level-focus.css"); - } + if (isSupported(ConditionalFeature.TWO_LEVEL_FOCUS)) { + StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/two-level-focus.css"); + } - if (isSupported(ConditionalFeature.VIRTUAL_KEYBOARD)) { - StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/fxvk.css"); - } - return null; + if (isSupported(ConditionalFeature.VIRTUAL_KEYBOARD)) { + StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/fxvk.css"); } - }); + return null; + } + ); } else if (Application.STYLESHEET_MODENA.equalsIgnoreCase(stylesheetUrl)) { isModena = true; AccessController.doPrivileged( - new PrivilegedAction() { - @Override public Object run() { - StyleManager.getInstance().setDefaultUserAgentStylesheet("com/sun/javafx/scene/control/skin/modena/modena.css"); + (PrivilegedAction) () -> { + StyleManager.getInstance().setDefaultUserAgentStylesheet("com/sun/javafx/scene/control/skin/modena/modena.css"); - if (isSupported(ConditionalFeature.INPUT_TOUCH)) { - StyleManager.getInstance().addUserAgentStylesheet( - "com/sun/javafx/scene/control/skin/modena/touch.css"); - } - // when running on embedded add a extra stylesheet to tune performance of modena theme - if (PlatformUtil.isEmbedded()) { - StyleManager.getInstance().addUserAgentStylesheet( - "com/sun/javafx/scene/control/skin/modena/modena-embedded-performance.css"); - } - if (PlatformUtil.isAndroid()) { - StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/modena/android.css"); - } + if (isSupported(ConditionalFeature.INPUT_TOUCH)) { + StyleManager.getInstance().addUserAgentStylesheet( + "com/sun/javafx/scene/control/skin/modena/touch.css"); + } + // when running on embedded add a extra stylesheet to tune performance of modena theme + if (PlatformUtil.isEmbedded()) { + StyleManager.getInstance().addUserAgentStylesheet( + "com/sun/javafx/scene/control/skin/modena/modena-embedded-performance.css"); + } + if (PlatformUtil.isAndroid()) { + StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/modena/android.css"); + } - if (isSupported(ConditionalFeature.TWO_LEVEL_FOCUS)) { - StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/modena/two-level-focus.css"); - } + if (isSupported(ConditionalFeature.TWO_LEVEL_FOCUS)) { + StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/modena/two-level-focus.css"); + } - if (isSupported(ConditionalFeature.VIRTUAL_KEYBOARD)) { - StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/fxvk.css"); - } - return null; + if (isSupported(ConditionalFeature.VIRTUAL_KEYBOARD)) { + StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/fxvk.css"); } - }); + return null; + } + ); // check to see if there is an override to enable a high-contrast theme final String highContrastName = AccessController.doPrivileged( - new PrivilegedAction() { - @Override public String run() { - return System.getProperty("com.sun.javafx.highContrastTheme"); - } - }); + (PrivilegedAction) () -> System.getProperty("com.sun.javafx.highContrastTheme")); if (highContrastName != null) { switch (highContrastName.toUpperCase()) { case "BLACKONWHITE": StyleManager.getInstance().addUserAgentStylesheet( @@ -667,20 +627,16 @@ public static void addNoTransparencyStylesheetToScene(final Scene scene) { if (PlatformImpl.isCaspian()) { - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Object run() { - StyleManager.getInstance().addUserAgentStylesheet(scene, - "com/sun/javafx/scene/control/skin/caspian/caspian-no-transparency.css"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + StyleManager.getInstance().addUserAgentStylesheet(scene, + "com/sun/javafx/scene/control/skin/caspian/caspian-no-transparency.css"); + return null; }); } else if (PlatformImpl.isModena()) { - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Object run() { - StyleManager.getInstance().addUserAgentStylesheet(scene, - "com/sun/javafx/scene/control/skin/modena/modena-no-transparency.css"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + StyleManager.getInstance().addUserAgentStylesheet(scene, + "com/sun/javafx/scene/control/skin/modena/modena-no-transparency.css"); + return null; }); } } diff --git a/modules/graphics/src/main/java/com/sun/javafx/css/SelectorPartitioning.java b/modules/graphics/src/main/java/com/sun/javafx/css/SelectorPartitioning.java --- a/modules/graphics/src/main/java/com/sun/javafx/css/SelectorPartitioning.java +++ b/modules/graphics/src/main/java/com/sun/javafx/css/SelectorPartitioning.java @@ -426,12 +426,7 @@ } private static final Comparator COMPARATOR = - new Comparator() { - @Override - public int compare(Selector o1, Selector o2) { - return o1.getOrdinal() - o2.getOrdinal(); - } - }; + (o1, o2) -> o1.getOrdinal() - o2.getOrdinal(); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/css/StyleManager.java b/modules/graphics/src/main/java/com/sun/javafx/css/StyleManager.java --- a/modules/graphics/src/main/java/com/sun/javafx/css/StyleManager.java +++ b/modules/graphics/src/main/java/com/sun/javafx/css/StyleManager.java @@ -855,12 +855,7 @@ ** let's check that the css file is being requested from our ** runtime jar */ - URI styleManagerJarURI = AccessController.doPrivileged(new PrivilegedExceptionAction() { - @Override - public URI run() throws java.net.URISyntaxException, java.security.PrivilegedActionException { - return StyleManager.class.getProtectionDomain().getCodeSource().getLocation().toURI(); - } - }); + URI styleManagerJarURI = AccessController.doPrivileged((PrivilegedExceptionAction) () -> StyleManager.class.getProtectionDomain().getCodeSource().getLocation().toURI()); final String styleManagerJarPath = styleManagerJarURI.getSchemeSpecificPart(); String requestedFilePath = requestedFileUrI.getSchemeSpecificPart(); @@ -896,12 +891,7 @@ */ JarFile jar = null; try { - jar = AccessController.doPrivileged(new PrivilegedExceptionAction() { - @Override - public JarFile run() throws FileNotFoundException, IOException { - return new JarFile(styleManagerJarPath); - } - }, permsAcc); + jar = AccessController.doPrivileged((PrivilegedExceptionAction) () -> new JarFile(styleManagerJarPath), permsAcc); } catch (PrivilegedActionException pae) { /* ** we got either a FileNotFoundException or an IOException @@ -920,10 +910,7 @@ ** allow read access to the jar */ return AccessController.doPrivileged( - new PrivilegedAction() { - @Override public Stylesheet run() { - return loadStylesheetUnPrivileged(fname); - }}, permsAcc); + (PrivilegedAction) () -> loadStylesheetUnPrivileged(fname), permsAcc); } } } @@ -953,16 +940,14 @@ private static Stylesheet loadStylesheetUnPrivileged(final String fname) { - Boolean parse = AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { + Boolean parse = AccessController.doPrivileged((PrivilegedAction) () -> { - final String bss = System.getProperty("binary.css"); - // binary.css is true by default. - // parse only if the file is not a .bss - // and binary.css is set to false - return (!fname.endsWith(".bss") && bss != null) ? - !Boolean.valueOf(bss) : Boolean.FALSE; - } + final String bss = System.getProperty("binary.css"); + // binary.css is true by default. + // parse only if the file is not a .bss + // and binary.css is set to false + return (!fname.endsWith(".bss") && bss != null) ? + !Boolean.valueOf(bss) : Boolean.FALSE; }); try { diff --git a/modules/graphics/src/main/java/com/sun/javafx/css/StyleMap.java b/modules/graphics/src/main/java/com/sun/javafx/css/StyleMap.java --- a/modules/graphics/src/main/java/com/sun/javafx/css/StyleMap.java +++ b/modules/graphics/src/main/java/com/sun/javafx/css/StyleMap.java @@ -153,27 +153,23 @@ } private static final Comparator cascadingStyleComparator = - new Comparator() { + (o1, o2) -> { - @Override public int compare(CascadingStyle o1, CascadingStyle o2) { + // + // primary sort is on property. If the property names are the same, + // then go through the cascade logic. Otherwise, sort by property + // name since the cascade doesn't matter for dissimilar properties. + // + // What we want to end up with is a list where all the same properties + // are together in the list. + // + String thisProperty = o1.getProperty(); + String otherProperty = o2.getProperty(); - // - // primary sort is on property. If the property names are the same, - // then go through the cascade logic. Otherwise, sort by property - // name since the cascade doesn't matter for dissimilar properties. - // - // What we want to end up with is a list where all the same properties - // are together in the list. - // - String thisProperty = o1.getProperty(); - String otherProperty = o2.getProperty(); + int c = thisProperty.compareTo(otherProperty); + if (c != 0) return c; - int c = thisProperty.compareTo(otherProperty); - if (c != 0) return c; - - return o1.compareTo(o2); - - } + return o1.compareTo(o2); }; diff --git a/modules/graphics/src/main/java/com/sun/javafx/css/parser/CSSLexer.java b/modules/graphics/src/main/java/com/sun/javafx/css/parser/CSSLexer.java --- a/modules/graphics/src/main/java/com/sun/javafx/css/parser/CSSLexer.java +++ b/modules/graphics/src/main/java/com/sun/javafx/css/parser/CSSLexer.java @@ -77,73 +77,65 @@ final static int FONT_FACE = 42; final static int URL = 43; - private final Recognizer A = (c) -> { return c == 'a' || c == 'A'; }; - private final Recognizer B = (c) -> { return c == 'b' || c == 'B'; }; - private final Recognizer C = (c) -> { return c == 'c' || c == 'C'; }; - private final Recognizer D = (c) -> { return c == 'd' || c == 'D'; }; - private final Recognizer E = (c) -> { return c == 'e' || c == 'E'; }; - private final Recognizer F = (c) -> { return c == 'f' || c == 'F'; }; - private final Recognizer G = (c) -> { return c == 'g' || c == 'G'; }; - private final Recognizer H = (c) -> { return c == 'h' || c == 'H'; }; - private final Recognizer I = (c) -> { return c == 'i' || c == 'I'; }; - private final Recognizer J = (c) -> { return c == 'j' || c == 'J'; }; - private final Recognizer K = (c) -> { return c == 'k' || c == 'K'; }; - private final Recognizer L = (c) -> { return c == 'l' || c == 'L'; }; - private final Recognizer M = (c) -> { return c == 'm' || c == 'M'; }; - private final Recognizer N = (c) -> { return c == 'n' || c == 'N'; }; - private final Recognizer O = (c) -> { return c == 'o' || c == 'O'; }; - private final Recognizer P = (c) -> { return c == 'p' || c == 'P'; }; - private final Recognizer Q = (c) -> { return c == 'q' || c == 'Q'; }; - private final Recognizer R = (c) -> { return c == 'r' || c == 'R'; }; - private final Recognizer S = (c) -> { return c == 's' || c == 'S'; }; - private final Recognizer T = (c) -> { return c == 't' || c == 'T'; }; - private final Recognizer U = (c) -> { return c == 'u' || c == 'U'; }; - private final Recognizer V = (c) -> { return c == 'v' || c == 'V'; }; - private final Recognizer W = (c) -> { return c == 'w' || c == 'W'; }; - private final Recognizer X = (c) -> { return c == 'x' || c == 'X'; }; - private final Recognizer Y = (c) -> { return c == 'y' || c == 'Y'; }; - private final Recognizer Z = (c) -> { return c == 'z' || c == 'Z'; }; - private final Recognizer ALPHA = (c) -> { - return ('a' <= c && c <= 'z') || - ('A' <= c && c <= 'Z'); - }; + private final Recognizer A = (c) -> c == 'a' || c == 'A'; + private final Recognizer B = (c) -> c == 'b' || c == 'B'; + private final Recognizer C = (c) -> c == 'c' || c == 'C'; + private final Recognizer D = (c) -> c == 'd' || c == 'D'; + private final Recognizer E = (c) -> c == 'e' || c == 'E'; + private final Recognizer F = (c) -> c == 'f' || c == 'F'; + private final Recognizer G = (c) -> c == 'g' || c == 'G'; + private final Recognizer H = (c) -> c == 'h' || c == 'H'; + private final Recognizer I = (c) -> c == 'i' || c == 'I'; + private final Recognizer J = (c) -> c == 'j' || c == 'J'; + private final Recognizer K = (c) -> c == 'k' || c == 'K'; + private final Recognizer L = (c) -> c == 'l' || c == 'L'; + private final Recognizer M = (c) -> c == 'm' || c == 'M'; + private final Recognizer N = (c) -> c == 'n' || c == 'N'; + private final Recognizer O = (c) -> c == 'o' || c == 'O'; + private final Recognizer P = (c) -> c == 'p' || c == 'P'; + private final Recognizer Q = (c) -> c == 'q' || c == 'Q'; + private final Recognizer R = (c) -> c == 'r' || c == 'R'; + private final Recognizer S = (c) -> c == 's' || c == 'S'; + private final Recognizer T = (c) -> c == 't' || c == 'T'; + private final Recognizer U = (c) -> c == 'u' || c == 'U'; + private final Recognizer V = (c) -> c == 'v' || c == 'V'; + private final Recognizer W = (c) -> c == 'w' || c == 'W'; + private final Recognizer X = (c) -> c == 'x' || c == 'X'; + private final Recognizer Y = (c) -> c == 'y' || c == 'Y'; + private final Recognizer Z = (c) -> c == 'z' || c == 'Z'; + private final Recognizer ALPHA = (c) -> ('a' <= c && c <= 'z') || + ('A' <= c && c <= 'Z'); - private final Recognizer NON_ASCII = (c) -> { return '\u0080' <= c && c <= '\uFFFF'; }; + private final Recognizer NON_ASCII = (c) -> '\u0080' <= c && c <= '\uFFFF'; - private final Recognizer DOT_CHAR = (c) -> { return c == '.'; }; - private final Recognizer GREATER_CHAR = (c) -> { return c == '>'; }; - private final Recognizer LBRACE_CHAR = (c) -> { return c == '{'; }; - private final Recognizer RBRACE_CHAR = (c) -> { return c == '}'; }; - private final Recognizer SEMI_CHAR = (c) -> { return c == ';'; }; - private final Recognizer COLON_CHAR = (c) -> { return c == ':'; }; - private final Recognizer SOLIDUS_CHAR = (c) -> { return c == '/'; }; - private final Recognizer MINUS_CHAR = (c) -> { return c == '-'; }; - private final Recognizer PLUS_CHAR = (c) -> { return c == '+'; }; - private final Recognizer STAR_CHAR = (c) -> { return c == '*'; }; - private final Recognizer LPAREN_CHAR = (c) -> { return c == '('; }; - private final Recognizer RPAREN_CHAR = (c) -> { return c == ')'; }; - private final Recognizer COMMA_CHAR = (c) -> { return c == ','; }; - private final Recognizer UNDERSCORE_CHAR = (c) -> { return c == '_'; }; - private final Recognizer HASH_CHAR = (c) -> { return c == '#'; }; + private final Recognizer DOT_CHAR = (c) -> c == '.'; + private final Recognizer GREATER_CHAR = (c) -> c == '>'; + private final Recognizer LBRACE_CHAR = (c) -> c == '{'; + private final Recognizer RBRACE_CHAR = (c) -> c == '}'; + private final Recognizer SEMI_CHAR = (c) -> c == ';'; + private final Recognizer COLON_CHAR = (c) -> c == ':'; + private final Recognizer SOLIDUS_CHAR = (c) -> c == '/'; + private final Recognizer MINUS_CHAR = (c) -> c == '-'; + private final Recognizer PLUS_CHAR = (c) -> c == '+'; + private final Recognizer STAR_CHAR = (c) -> c == '*'; + private final Recognizer LPAREN_CHAR = (c) -> c == '('; + private final Recognizer RPAREN_CHAR = (c) -> c == ')'; + private final Recognizer COMMA_CHAR = (c) -> c == ','; + private final Recognizer UNDERSCORE_CHAR = (c) -> c == '_'; + private final Recognizer HASH_CHAR = (c) -> c == '#'; - private final Recognizer WS_CHARS = (c) -> { - return c == ' ' || - c == '\t' || - c == '\r' || - c == '\n' || - c == '\f'; - }; - private final Recognizer NL_CHARS = (c) -> { - return (c == '\r' || c == '\n'); - }; + private final Recognizer WS_CHARS = (c) -> c == ' ' || + c == '\t' || + c == '\r' || + c == '\n' || + c == '\f'; + private final Recognizer NL_CHARS = (c) -> (c == '\r' || c == '\n'); - private final Recognizer DIGIT = (c) -> { return '0' <= c && c <= '9'; }; + private final Recognizer DIGIT = (c) -> '0' <= c && c <= '9'; - private final Recognizer HEX_DIGIT = (c) -> { - return ('0' <= c && c <= '9') || - ('a' <= c && c <= 'f') || - ('A' <= c && c <= 'F'); - }; + private final Recognizer HEX_DIGIT = (c) -> ('0' <= c && c <= '9') || + ('a' <= c && c <= 'f') || + ('A' <= c && c <= 'F'); // The initial accepts any character final LexerState initState = new LexerState("initState", null) { @@ -616,7 +608,7 @@ { P, X }, { R, A, D }, { T, U, R, N }, - { (c) -> { return c == '%'; } } + { (c) -> c == '%'} }; diff --git a/modules/graphics/src/main/java/com/sun/javafx/font/AndroidFontFinder.java b/modules/graphics/src/main/java/com/sun/javafx/font/AndroidFontFinder.java --- a/modules/graphics/src/main/java/com/sun/javafx/font/AndroidFontFinder.java +++ b/modules/graphics/src/main/java/com/sun/javafx/font/AndroidFontFinder.java @@ -63,11 +63,9 @@ final static String systemFontsDir = "/system/fonts"; static { - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - NativeLibLoader.loadLibrary("javafx_font"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + NativeLibLoader.loadLibrary("javafx_font"); + return null; }); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java b/modules/graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java --- a/modules/graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java +++ b/modules/graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java @@ -33,11 +33,9 @@ class DFontDecoder extends FontFileWriter { static { - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - NativeLibLoader.loadLibrary("javafx_font"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + NativeLibLoader.loadLibrary("javafx_font"); + return null; }); } private native static long createCTFont(String fontName); diff --git a/modules/graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java b/modules/graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java --- a/modules/graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java +++ b/modules/graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java @@ -45,8 +45,7 @@ static { AccessController.doPrivileged( - new PrivilegedAction() { - public Void run() { + (PrivilegedAction) () -> { String dbg = System.getProperty("prism.debugfonts", ""); debugFonts = "true".equals(dbg); String ufc = System.getProperty("prism.useFontConfig", "true"); @@ -55,7 +54,6 @@ useEmbeddedFontSupport = "true".equals(emb); return null; } - } ); } @@ -350,12 +348,10 @@ static { AccessController.doPrivileged( - new PrivilegedAction() { - public Void run() { + (PrivilegedAction) () -> { initEmbeddedFonts(); return null; } - } ); } @@ -403,11 +399,7 @@ private static boolean exists(final File f) { return AccessController.doPrivileged( - new PrivilegedAction() { - public Boolean run() { - return f.exists(); - } - } + (PrivilegedAction) () -> f.exists() ); } @@ -551,23 +543,22 @@ { final Properties props = new Properties(); AccessController.doPrivileged( - new PrivilegedAction() { - public Void run() { - try { - String lFile = fontDir+"/allfonts.properties"; - FileInputStream fis = new FileInputStream(lFile); - props.load(fis); - fis.close(); - } catch (IOException ioe) { - props.clear(); - if (debugFonts) { - System.err.println(ioe); - System.err.println("Fall back to opening the files"); + (PrivilegedAction) () -> { + try { + String lFile = fontDir+"/allfonts.properties"; + FileInputStream fis = new FileInputStream(lFile); + props.load(fis); + fis.close(); + } catch (IOException ioe) { + props.clear(); + if (debugFonts) { + System.err.println(ioe); + System.err.println("Fall back to opening the files"); + } } + return null; } - return null; - } - }); + ); if (!props.isEmpty()) { int maxFont = Integer.MAX_VALUE; diff --git a/modules/graphics/src/main/java/com/sun/javafx/font/FontFileReader.java b/modules/graphics/src/main/java/com/sun/javafx/font/FontFileReader.java --- a/modules/graphics/src/main/java/com/sun/javafx/font/FontFileReader.java +++ b/modules/graphics/src/main/java/com/sun/javafx/font/FontFileReader.java @@ -59,15 +59,14 @@ return false; } raFile = AccessController.doPrivileged( - new PrivilegedAction() { - public RandomAccessFile run() { - try { - return new RandomAccessFile(filename, "r"); - } catch (FileNotFoundException fnfe) { - return null; - } + (PrivilegedAction) () -> { + try { + return new RandomAccessFile(filename, "r"); + } catch (FileNotFoundException fnfe) { + return null; } - }); + } + ); if (raFile != null) { try { filesize = raFile.length(); diff --git a/modules/graphics/src/main/java/com/sun/javafx/font/FontFileWriter.java b/modules/graphics/src/main/java/com/sun/javafx/font/FontFileWriter.java --- a/modules/graphics/src/main/java/com/sun/javafx/font/FontFileWriter.java +++ b/modules/graphics/src/main/java/com/sun/javafx/font/FontFileWriter.java @@ -84,8 +84,7 @@ pos = 0; writtenBytes = 0; file = AccessController.doPrivileged( - new PrivilegedExceptionAction() { - public File run() throws IOException { + (PrivilegedExceptionAction) () -> { try { return Files.createTempFile("+JXF", ".tmp").toFile(); } catch (IOException e) { @@ -93,17 +92,12 @@ throw new IOException("Unable to create temporary file"); } } - } ); if (tracker != null) { tracker.add(file); } raFile = AccessController.doPrivileged( - new PrivilegedExceptionAction() { - public RandomAccessFile run() throws IOException { - return new RandomAccessFile(file, "rw"); - } - } + (PrivilegedExceptionAction) () -> new RandomAccessFile(file, "rw") ); if (tracker != null) { tracker.set(file, raFile); @@ -140,12 +134,10 @@ } try { AccessController.doPrivileged( - new PrivilegedExceptionAction() { - public Void run() { + (PrivilegedExceptionAction) () -> { file.delete(); return null; } - } ); if (PrismFontFactory.debugFonts) { System.err.println("Temp file delete: " + file.getPath()); @@ -354,17 +346,14 @@ if (t == null) { // Add a shutdown hook to remove the temp file. java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public Object run() { - t = new Thread(new Runnable() { - public void run() { - runHooks(); - } - }); + (java.security.PrivilegedAction) () -> { + t = new Thread(() -> { + runHooks(); + }); Runtime.getRuntime().addShutdownHook(t); return null; } - }); + ); } } diff --git a/modules/graphics/src/main/java/com/sun/javafx/font/MacFontFinder.java b/modules/graphics/src/main/java/com/sun/javafx/font/MacFontFinder.java --- a/modules/graphics/src/main/java/com/sun/javafx/font/MacFontFinder.java +++ b/modules/graphics/src/main/java/com/sun/javafx/font/MacFontFinder.java @@ -37,12 +37,10 @@ static { AccessController.doPrivileged( - new PrivilegedAction() { - public Void run() { + (PrivilegedAction) () -> { NativeLibLoader.loadLibrary("javafx_font"); return null; } - } ); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java b/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java --- a/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java +++ b/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java @@ -92,8 +92,7 @@ isEmbedded = PlatformUtil.isEmbedded(); debugFonts = AccessController.doPrivileged( - new PrivilegedAction() { - public Boolean run() { + (PrivilegedAction) () -> { NativeLibLoader.loadLibrary("javafx_font"); String dbg = System.getProperty("prism.debugfonts", ""); boolean debug = "true".equals(dbg); @@ -149,7 +148,7 @@ return debug; } - }); + ); } private static String getNativeFactoryName() { @@ -1378,26 +1377,23 @@ private synchronized void addFileCloserHook() { if (fileCloser == null) { - final Runnable fileCloserRunnable = new Runnable() { - public void run() { - if (embeddedFonts != null) { - for (PrismFontFile font : embeddedFonts.values()) { - font.disposeOnShutdown(); - } - } - if (tmpFonts != null) { - for (WeakReference ref : tmpFonts) { - PrismFontFile font = ref.get(); - if (font != null) { - font.disposeOnShutdown(); - } - } + final Runnable fileCloserRunnable = () -> { + if (embeddedFonts != null) { + for (PrismFontFile font : embeddedFonts.values()) { + font.disposeOnShutdown(); + } + } + if (tmpFonts != null) { + for (WeakReference ref : tmpFonts) { + PrismFontFile font = ref.get(); + if (font != null) { + font.disposeOnShutdown(); } } + } }; java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public Object run() { + (PrivilegedAction) () -> { /* The thread must be a member of a thread group * which will not get GCed before VM exit. * Make its parent the top-level thread group. @@ -1410,7 +1406,7 @@ Runtime.getRuntime().addShutdownHook(fileCloser); return null; } - }); + ); } } @@ -1805,11 +1801,7 @@ String[] files = null; try { files = AccessController.doPrivileged( - new PrivilegedExceptionAction() { - public String[] run() { - return dir.list(TTFilter.getInstance()); - } - } + (PrivilegedExceptionAction) () -> dir.list(TTFilter.getInstance()) ); } catch (Exception e) { } diff --git a/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFile.java b/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFile.java --- a/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFile.java +++ b/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFile.java @@ -119,8 +119,7 @@ protected synchronized void disposeOnShutdown() { if (isCopy || isDecoded) { AccessController.doPrivileged( - new PrivilegedAction() { - public Void run() { + (PrivilegedAction) () -> { try { (new File(filename)).delete(); /* Embedded fonts (copy) can also be decoded. @@ -131,7 +130,6 @@ } return null; } - } ); if (PrismFontFactory.debugFonts) { System.err.println("Temp file deleted: " + filename); @@ -171,8 +169,7 @@ public synchronized void dispose() { if (fileName != null) { AccessController.doPrivileged( - new PrivilegedAction() { - public Void run() { + (PrivilegedAction) () -> { try { File file = new File(fileName); int size = (int)file.length(); @@ -201,7 +198,6 @@ } return null; } - } ); fileName = null; } diff --git a/modules/graphics/src/main/java/com/sun/javafx/font/WoffDecoder.java b/modules/graphics/src/main/java/com/sun/javafx/font/WoffDecoder.java --- a/modules/graphics/src/main/java/com/sun/javafx/font/WoffDecoder.java +++ b/modules/graphics/src/main/java/com/sun/javafx/font/WoffDecoder.java @@ -55,12 +55,7 @@ writeHeader(format, numTables); /* Tables should be written in the same order as the original file */ - Arrays.sort(woffTableDirectory, new Comparator () { - @Override - public int compare(WoffDirectoryEntry o1, WoffDirectoryEntry o2) { - return o1.offset - o2.offset; - } - }); + Arrays.sort(woffTableDirectory, (o1, o2) -> o1.offset - o2.offset); Inflater decompressor = new Inflater(); int offset = TTCHEADERSIZE + numTables * DIRECTORYENTRYSIZE; diff --git a/modules/graphics/src/main/java/com/sun/javafx/font/coretext/OS.java b/modules/graphics/src/main/java/com/sun/javafx/font/coretext/OS.java --- a/modules/graphics/src/main/java/com/sun/javafx/font/coretext/OS.java +++ b/modules/graphics/src/main/java/com/sun/javafx/font/coretext/OS.java @@ -34,11 +34,9 @@ class OS { static { - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - NativeLibLoader.loadLibrary("javafx_font"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + NativeLibLoader.loadLibrary("javafx_font"); + return null; }); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java b/modules/graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java --- a/modules/graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java +++ b/modules/graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java @@ -33,11 +33,9 @@ class OS { static { - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - NativeLibLoader.loadLibrary("javafx_font"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + NativeLibLoader.loadLibrary("javafx_font"); + return null; }); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/font/freetype/OSFreetype.java b/modules/graphics/src/main/java/com/sun/javafx/font/freetype/OSFreetype.java --- a/modules/graphics/src/main/java/com/sun/javafx/font/freetype/OSFreetype.java +++ b/modules/graphics/src/main/java/com/sun/javafx/font/freetype/OSFreetype.java @@ -33,11 +33,9 @@ class OSFreetype { static { - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - NativeLibLoader.loadLibrary("javafx_font_freetype"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + NativeLibLoader.loadLibrary("javafx_font_freetype"); + return null; }); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/font/freetype/OSPango.java b/modules/graphics/src/main/java/com/sun/javafx/font/freetype/OSPango.java --- a/modules/graphics/src/main/java/com/sun/javafx/font/freetype/OSPango.java +++ b/modules/graphics/src/main/java/com/sun/javafx/font/freetype/OSPango.java @@ -32,11 +32,9 @@ class OSPango { static { - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - NativeLibLoader.loadLibrary("javafx_font_pango"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + NativeLibLoader.loadLibrary("javafx_font_pango"); + return null; }); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/geom/AreaOp.java b/modules/graphics/src/main/java/com/sun/javafx/geom/AreaOp.java --- a/modules/graphics/src/main/java/com/sun/javafx/geom/AreaOp.java +++ b/modules/graphics/src/main/java/com/sun/javafx/geom/AreaOp.java @@ -178,21 +178,19 @@ } } - private static Comparator YXTopComparator = new Comparator() { - public int compare(Object o1, Object o2) { - Curve c1 = ((Edge) o1).getCurve(); - Curve c2 = ((Edge) o2).getCurve(); - double v1, v2; - if ((v1 = c1.getYTop()) == (v2 = c2.getYTop())) { - if ((v1 = c1.getXTop()) == (v2 = c2.getXTop())) { - return 0; - } + private static Comparator YXTopComparator = (o1, o2) -> { + Curve c1 = ((Edge) o1).getCurve(); + Curve c2 = ((Edge) o2).getCurve(); + double v1, v2; + if ((v1 = c1.getYTop()) == (v2 = c2.getYTop())) { + if ((v1 = c1.getXTop()) == (v2 = c2.getXTop())) { + return 0; } - if (v1 < v2) { - return -1; - } - return 1; } + if (v1 < v2) { + return -1; + } + return 1; }; private Vector pruneEdges(Vector edges) { diff --git a/modules/graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java b/modules/graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java --- a/modules/graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java +++ b/modules/graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java @@ -109,13 +109,9 @@ static { - AccessController.doPrivileged(new PrivilegedAction() { - - @Override - public Object run() { - NativeLibLoader.loadLibrary("nativeiio"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + NativeLibLoader.loadLibrary("nativeiio"); + return null; }); colorSpaceMapping.put(GRAY, ImageType.GRAY); diff --git a/modules/graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java b/modules/graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java --- a/modules/graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java +++ b/modules/graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java @@ -107,12 +107,9 @@ //private native ByteBuffer decompressDirect(long structPointer, boolean reportProgress) throws IOException; static { - AccessController.doPrivileged(new PrivilegedAction() { - - public Object run() { - NativeLibLoader.loadLibrary("javafx_iio"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + NativeLibLoader.loadLibrary("javafx_iio"); + return null; }); initJPEGMethodIDs(InputStream.class); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/robot/impl/BaseFXRobot.java b/modules/graphics/src/main/java/com/sun/javafx/robot/impl/BaseFXRobot.java --- a/modules/graphics/src/main/java/com/sun/javafx/robot/impl/BaseFXRobot.java +++ b/modules/graphics/src/main/java/com/sun/javafx/robot/impl/BaseFXRobot.java @@ -122,11 +122,7 @@ @Override public void waitForIdle() { // TODO: use better scheme for waiting when pulses stop final CountDownLatch latch = new CountDownLatch(1); - Toolkit.getToolkit().defer(new Runnable() { - public void run() { - latch.countDown(); - } - }); + Toolkit.getToolkit().defer(() -> latch.countDown()); while (true) { try { latch.await(); @@ -210,11 +206,9 @@ createKeyEvent(eventType, keyCode, keyChar, keyText, isShiftDown, isControlDown, isAltDown, isMetaDown); - Toolkit.getToolkit().defer(new Runnable() { - public void run() { - out("doKeyEvent: injecting: {e}"); - FXRobotHelper.sceneAccessor.processKeyEvent(target, e); - } + Toolkit.getToolkit().defer(() -> { + out("doKeyEvent: injecting: {e}"); + FXRobotHelper.sceneAccessor.processKeyEvent(target, e); }); if (autoWait) { waitForIdle(); @@ -267,11 +261,9 @@ isButton1Pressed, isButton2Pressed, isButton3Pressed); - Toolkit.getToolkit().defer(new Runnable() { - public void run() { - out("doMouseEvent: injecting: " + e); - FXRobotHelper.sceneAccessor.processMouseEvent(target, e); - } + Toolkit.getToolkit().defer(() -> { + out("doMouseEvent: injecting: " + e); + FXRobotHelper.sceneAccessor.processMouseEvent(target, e); }); if (autoWait) { waitForIdle(); @@ -296,11 +288,9 @@ isControlDown, isAltDown, isMetaDown); - Toolkit.getToolkit().defer(new Runnable() { - public void run() { - out("doScrollEvent: injecting: " + e); - FXRobotHelper.sceneAccessor.processScrollEvent(target, e); - } + Toolkit.getToolkit().defer(() -> { + out("doScrollEvent: injecting: " + e); + FXRobotHelper.sceneAccessor.processScrollEvent(target, e); }); if (autoWait) { waitForIdle(); diff --git a/modules/graphics/src/main/java/com/sun/javafx/runtime/async/AbstractAsyncOperation.java b/modules/graphics/src/main/java/com/sun/javafx/runtime/async/AbstractAsyncOperation.java --- a/modules/graphics/src/main/java/com/sun/javafx/runtime/async/AbstractAsyncOperation.java +++ b/modules/graphics/src/main/java/com/sun/javafx/runtime/async/AbstractAsyncOperation.java @@ -54,11 +54,7 @@ protected AbstractAsyncOperation(final AsyncOperationListener listener) { this.listener = listener; - Callable callable = new Callable() { - public V call() throws Exception { - return AbstractAsyncOperation.this.call(); - } - }; + Callable callable = () -> AbstractAsyncOperation.this.call(); final Runnable completionRunnable = new Runnable() { public void run() { @@ -110,11 +106,7 @@ protected void notifyProgress() { final int last = lastProgress; final int max = progressMax; - Platform.runLater(new Runnable() { - public void run() { - listener.onProgress(last, max); - } - }); + Platform.runLater(() -> listener.onProgress(last, max)); } protected void addProgress(int amount) { diff --git a/modules/graphics/src/main/java/com/sun/javafx/runtime/async/BackgroundExecutor.java b/modules/graphics/src/main/java/com/sun/javafx/runtime/async/BackgroundExecutor.java --- a/modules/graphics/src/main/java/com/sun/javafx/runtime/async/BackgroundExecutor.java +++ b/modules/graphics/src/main/java/com/sun/javafx/runtime/async/BackgroundExecutor.java @@ -47,12 +47,10 @@ public static synchronized ExecutorService getExecutor() { if (instance == null) { - instance = Executors.newCachedThreadPool(new ThreadFactory() { - public Thread newThread(Runnable r) { - Thread t = new Thread(r); - t.setPriority(Thread.MIN_PRIORITY); - return t; - } + instance = Executors.newCachedThreadPool(r -> { + Thread t = new Thread(r); + t.setPriority(Thread.MIN_PRIORITY); + return t; }); ((ThreadPoolExecutor) instance).setKeepAliveTime(1, TimeUnit.SECONDS); } @@ -64,13 +62,12 @@ if (timerInstance == null) { // @@@ Here's where we load the configuration and such timerInstance = new ScheduledThreadPoolExecutor(1, - new ThreadFactory() { - public Thread newThread(Runnable r) { - Thread t = new Thread(r); - t.setDaemon(true); - return t; - } - }); + r -> { + Thread t = new Thread(r); + t.setDaemon(true); + return t; + } + ); } return timerInstance; diff --git a/modules/graphics/src/main/java/com/sun/javafx/scene/paint/GradientUtils.java b/modules/graphics/src/main/java/com/sun/javafx/scene/paint/GradientUtils.java --- a/modules/graphics/src/main/java/com/sun/javafx/scene/paint/GradientUtils.java +++ b/modules/graphics/src/main/java/com/sun/javafx/scene/paint/GradientUtils.java @@ -106,12 +106,7 @@ } public Parser(String content) { - tokens = splitString(content, new Delimiter() { - @Override - public boolean isDelimiter(char value) { - return (value == ','); - } - }, false); + tokens = splitString(content, value -> (value == ','), false); index = 0; } @@ -215,12 +210,7 @@ for (int i = 0; i < stopsCount; i++) { String stopString = tokens[i + index].trim(); - String[] stopTokens = splitString(stopString, new Delimiter() { - @Override - public boolean isDelimiter(char value) { - return Character.isWhitespace(value); - } - }, true); + String[] stopTokens = splitString(stopString, value -> Character.isWhitespace(value), true); if (stopTokens.length == 0) { throw new IllegalArgumentException("Invalid gradient specification, " diff --git a/modules/graphics/src/main/java/com/sun/javafx/scene/traversal/Hueristic2D.java b/modules/graphics/src/main/java/com/sun/javafx/scene/traversal/Hueristic2D.java --- a/modules/graphics/src/main/java/com/sun/javafx/scene/traversal/Hueristic2D.java +++ b/modules/graphics/src/main/java/com/sun/javafx/scene/traversal/Hueristic2D.java @@ -252,21 +252,9 @@ } } - private static final Function BOUNDS_TOP_SIDE = new Function() { + private static final Function BOUNDS_TOP_SIDE = t -> t.getMinY(); - @Override - public Double apply(Bounds t) { - return t.getMinY(); - } - }; - - private static final Function BOUNDS_BOTTOM_SIDE = new Function() { - - @Override - public Double apply(Bounds t) { - return t.getMaxY(); - } - }; + private static final Function BOUNDS_BOTTOM_SIDE = t -> t.getMaxY(); protected Node getNearestNodeUpOrDown(Bounds currentB, Bounds originB, TraversalContext context, Direction dir) { @@ -558,21 +546,9 @@ return null; } - private static final Function BOUNDS_LEFT_SIDE = new Function() { - - @Override - public Double apply(Bounds t) { - return t.getMinX(); - } - }; + private static final Function BOUNDS_LEFT_SIDE = t -> t.getMinX(); - private static final Function BOUNDS_RIGHT_SIDE = new Function() { - - @Override - public Double apply(Bounds t) { - return t.getMaxX(); - } - }; + private static final Function BOUNDS_RIGHT_SIDE = t -> t.getMaxX(); protected Node getNearestNodeLeftOrRight(Bounds currentB, Bounds originB, TraversalContext context, Direction dir) { diff --git a/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java b/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java --- a/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java +++ b/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java @@ -553,11 +553,9 @@ texg.setCompositeMode(CompositeMode.SRC); if (cv.savedPixelData == null) { final PixelData pd = new PixelData(cw, ch); - runOnRenderThread(new Runnable() { - public void run() { - pd.save(localTex); - pd.restore(texg, tw, th); - } + runOnRenderThread(() -> { + pd.save(localTex); + pd.restore(texg, tw, th); }); } else { cv.savedPixelData.restore(texg, tw, th); diff --git a/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGExternalNode.java b/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGExternalNode.java --- a/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGExternalNode.java +++ b/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGExternalNode.java @@ -193,26 +193,20 @@ height < bufferData.srcbounds.height; bufferData = bufferData.copyWithBounds(x, y, width, height); - renderData.updateAndGet(new UnaryOperator() { - @Override - public RenderData apply(RenderData prev) { - boolean clearTarget = (prev != null ? prev.clearTarget : false); - return new RenderData(bufferData, x, y, width, height, clearTarget | shrinked); - } + renderData.updateAndGet(prev -> { + boolean clearTarget = (prev != null ? prev.clearTarget : false); + return new RenderData(bufferData, x, y, width, height, clearTarget | shrinked); }); } public void repaintDirtyRegion(final int dirtyX, final int dirtyY, final int dirtyWidth, final int dirtyHeight) { - renderData.updateAndGet(new UnaryOperator() { - @Override - public RenderData apply(RenderData prev) { - if (prev != null) { - return prev.copyAddDirtyRect(dirtyX, dirtyY, dirtyWidth, dirtyHeight); - } else { - return new RenderData(bufferData, dirtyX, dirtyY, dirtyWidth, dirtyHeight, false); - } + renderData.updateAndGet(prev -> { + if (prev != null) { + return prev.copyAddDirtyRect(dirtyX, dirtyY, dirtyWidth, dirtyHeight); + } else { + return new RenderData(bufferData, dirtyX, dirtyY, dirtyWidth, dirtyHeight, false); } }); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/Toolkit.java b/modules/graphics/src/main/java/com/sun/javafx/tk/Toolkit.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/Toolkit.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/Toolkit.java @@ -135,18 +135,12 @@ return TOOLKIT; } - final boolean verbose = AccessController.doPrivileged(new PrivilegedAction() { - public Boolean run() { - return Boolean.getBoolean("javafx.verbose"); - } - }); - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - // Get the javafx.version and javafx.runtime.version from a preconstructed - // java class, VersionInfo, created at build time. - VersionInfo.setupSystemProperties(); - return null; - } + final boolean verbose = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.verbose")); + AccessController.doPrivileged((PrivilegedAction) () -> { + // Get the javafx.version and javafx.runtime.version from a preconstructed + // java class, VersionInfo, created at build time. + VersionInfo.setupSystemProperties(); + return null; }); boolean userSpecifiedToolkit = true; @@ -317,11 +311,9 @@ throw new IllegalStateException("Invalid AccessControlContext"); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Void run() { - listener.pulse(); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + listener.pulse(); + return null; }, acc); } @@ -453,11 +445,9 @@ throw new IllegalStateException("Invalid AccessControlContext"); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Void run() { - listener.changedTopLevelWindows(windows); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + listener.changedTopLevelWindows(windows); + return null; }, acc); } } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java @@ -163,19 +163,13 @@ @Override public void setSize(final int width, final int height) { - Platform.runLater(new Runnable() { - @Override - public void run() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (sceneListener != null) { - sceneListener.changedSize(width, height); - } - return null; - } - }, getAccessControlContext()); - } + Platform.runLater(() -> { + AccessController.doPrivileged((PrivilegedAction) () -> { + if (sceneListener != null) { + sceneListener.changedSize(width, height); + } + return null; + }, getAccessControlContext()); }); } @@ -240,33 +234,27 @@ final boolean shift, final boolean ctrl, final boolean alt, final boolean meta, final int wheelRotation, final boolean popupTrigger) { - Platform.runLater(new Runnable() { - @Override - public void run() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (sceneListener == null) { - return null; - } - // Click events are generated in Scene, so we don't expect them here - assert type != AbstractEvents.MOUSEEVENT_CLICKED; - if (type == AbstractEvents.MOUSEEVENT_WHEEL) { - sceneListener.scrollEvent(ScrollEvent.SCROLL, 0, -wheelRotation, 0, 0, 40.0, 40.0, - 0, 0, 0, 0, 0, - x, y, xAbs, yAbs, shift, ctrl, alt, meta, false, false); - } else { - EventType eventType = AbstractEvents.mouseIDToFXEventID(type); - sceneListener.mouseEvent(eventType, x, y, xAbs, yAbs, - AbstractEvents.mouseButtonToFXMouseButton(button), - popupTrigger, false, // do we know if it's synthesized? RT-20142 - shift, ctrl, alt, meta, - primaryBtnDown, middleBtnDown, secondaryBtnDown); - } - return null; - } - }, getAccessControlContext()); - } + Platform.runLater(() -> { + AccessController.doPrivileged((PrivilegedAction) () -> { + if (sceneListener == null) { + return null; + } + // Click events are generated in Scene, so we don't expect them here + assert type != AbstractEvents.MOUSEEVENT_CLICKED; + if (type == AbstractEvents.MOUSEEVENT_WHEEL) { + sceneListener.scrollEvent(ScrollEvent.SCROLL, 0, -wheelRotation, 0, 0, 40.0, 40.0, + 0, 0, 0, 0, 0, + x, y, xAbs, yAbs, shift, ctrl, alt, meta, false, false); + } else { + EventType eventType = AbstractEvents.mouseIDToFXEventID(type); + sceneListener.mouseEvent(eventType, x, y, xAbs, yAbs, + AbstractEvents.mouseButtonToFXMouseButton(button), + popupTrigger, false, // do we know if it's synthesized? RT-20142 + shift, ctrl, alt, meta, + primaryBtnDown, middleBtnDown, secondaryBtnDown); + } + return null; + }, getAccessControlContext()); }); } @@ -274,67 +262,49 @@ public void inputMethodEvent(final EventType type, final ObservableList composed, final String committed, final int caretPosition) { - Platform.runLater(new Runnable() { - @Override - public void run() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (sceneListener != null) { - sceneListener.inputMethodEvent(type, composed, committed, caretPosition); - } - return null; - } - }); - } + Platform.runLater(() -> { + AccessController.doPrivileged((PrivilegedAction) () -> { + if (sceneListener != null) { + sceneListener.inputMethodEvent(type, composed, committed, caretPosition); + } + return null; + }); }); } @Override public void menuEvent(final int x, final int y, final int xAbs, final int yAbs, final boolean isKeyboardTrigger) { - Platform.runLater(new Runnable() { - @Override - public void run() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (sceneListener != null) { - sceneListener.menuEvent(x, y, xAbs, yAbs, isKeyboardTrigger); - } - return null; - } - }, getAccessControlContext()); - } + Platform.runLater(() -> { + AccessController.doPrivileged((PrivilegedAction) () -> { + if (sceneListener != null) { + sceneListener.menuEvent(x, y, xAbs, yAbs, isKeyboardTrigger); + } + return null; + }, getAccessControlContext()); }); } @Override public void keyEvent(final int type, final int key, final char[] ch, final int modifiers) { - Platform.runLater(new Runnable() { - @Override - public void run() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (sceneListener != null) { - boolean shiftDown = (modifiers & AbstractEvents.MODIFIER_SHIFT) != 0; - boolean controlDown = (modifiers & AbstractEvents.MODIFIER_CONTROL) != 0; - boolean altDown = (modifiers & AbstractEvents.MODIFIER_ALT) != 0; - boolean metaDown = (modifiers & AbstractEvents.MODIFIER_META) != 0; + Platform.runLater(() -> { + AccessController.doPrivileged((PrivilegedAction) () -> { + if (sceneListener != null) { + boolean shiftDown = (modifiers & AbstractEvents.MODIFIER_SHIFT) != 0; + boolean controlDown = (modifiers & AbstractEvents.MODIFIER_CONTROL) != 0; + boolean altDown = (modifiers & AbstractEvents.MODIFIER_ALT) != 0; + boolean metaDown = (modifiers & AbstractEvents.MODIFIER_META) != 0; - String str = new String(ch); - String text = str; // TODO: this must be a text like "HOME", "F1", or "A" - javafx.scene.input.KeyEvent keyEvent = new javafx.scene.input.KeyEvent( - AbstractEvents.keyIDToFXEventType(type), - str, text, - KeyCodeMap.valueOf(key), - shiftDown, controlDown, altDown, metaDown); - sceneListener.keyEvent(keyEvent); - } - return null; - } - }, getAccessControlContext()); - } + String str = new String(ch); + String text = str; // TODO: this must be a text like "HOME", "F1", or "A" + javafx.scene.input.KeyEvent keyEvent = new javafx.scene.input.KeyEvent( + AbstractEvents.keyIDToFXEventType(type), + str, text, + KeyCodeMap.valueOf(key), + shiftDown, controlDown, altDown, metaDown); + sceneListener.keyEvent(keyEvent); + } + return null; + }, getAccessControlContext()); }); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedSceneDS.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedSceneDS.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedSceneDS.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedSceneDS.java @@ -50,61 +50,38 @@ @Override public Set getSupportedActions() { assert dnd.isHostThread(); - return dnd.executeOnFXThread(new Callable>() { - @Override - public Set call() { - return QuantumClipboard.clipboardActionsToTransferModes( - assistant.getSupportedSourceActions()); - } - }); + return dnd.executeOnFXThread(() -> QuantumClipboard.clipboardActionsToTransferModes( + assistant.getSupportedSourceActions())); } @Override public Object getData(final String mimeType) { assert dnd.isHostThread(); - return dnd.executeOnFXThread(new Callable() { - @Override - public Object call() { - return assistant.getData(mimeType); - } - }); + return dnd.executeOnFXThread(() -> assistant.getData(mimeType)); } @Override public String[] getMimeTypes() { assert dnd.isHostThread(); - return dnd.executeOnFXThread(new Callable() { - @Override - public String[] call() { - return assistant.getMimeTypes(); - } - }); + return dnd.executeOnFXThread(() -> assistant.getMimeTypes()); } @Override public boolean isMimeTypeAvailable(final String mimeType) { assert dnd.isHostThread(); - return dnd.executeOnFXThread(new Callable() { - @Override - public Boolean call() { - return Arrays.asList(assistant.getMimeTypes()).contains(mimeType); - } - }); + return dnd.executeOnFXThread(() -> Arrays.asList(assistant.getMimeTypes()).contains(mimeType)); } @Override public void dragDropEnd(final TransferMode performedAction) { assert dnd.isHostThread(); - dnd.executeOnFXThread(new Callable() { - @Override - public Void call() { - try { - dndHandler.handleDragEnd(performedAction, assistant); - } finally { - dnd.onDragSourceReleased(EmbeddedSceneDS.this); - } - return null; + dnd.executeOnFXThread(() -> { + try { + dndHandler.handleDragEnd(performedAction, assistant); + } finally { + dnd.onDragSourceReleased(EmbeddedSceneDS.this); } + return null; }); } } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedSceneDT.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedSceneDT.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedSceneDT.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedSceneDT.java @@ -58,19 +58,16 @@ { assert dnd.isHostThread(); - return dnd.executeOnFXThread(new Callable() { - @Override - public TransferMode call() { - assert dragSource == null; - assert assistant == null; + return dnd.executeOnFXThread(() -> { + assert dragSource == null; + assert assistant == null; - dragSource = ds; - assistant = new EmbeddedDTAssistant(dragSource); + dragSource = ds; + assistant = new EmbeddedDTAssistant(dragSource); - return dndHandler.handleDragEnter(x, y, xAbs, yAbs, - recommendedDropAction, - assistant); - } + return dndHandler.handleDragEnter(x, y, xAbs, yAbs, + recommendedDropAction, + assistant); }); } @@ -78,17 +75,14 @@ public void handleDragLeave() { assert dnd.isHostThread(); - dnd.executeOnFXThread(new Callable() { - @Override - public Void call() { - assert assistant != null; - try { - dndHandler.handleDragLeave(assistant); - } finally { - close(); - } - return null; + dnd.executeOnFXThread(() -> { + assert assistant != null; + try { + dndHandler.handleDragLeave(assistant); + } finally { + close(); } + return null; }); } @@ -98,17 +92,14 @@ final TransferMode recommendedDropAction) { assert dnd.isHostThread(); - return dnd.executeOnFXThread(new Callable() { - @Override - public TransferMode call() { - assert assistant != null; - try { - return dndHandler.handleDragDrop(x, y, xAbs, yAbs, - recommendedDropAction, - assistant); - } finally { - close(); - } + return dnd.executeOnFXThread(() -> { + assert assistant != null; + try { + return dndHandler.handleDragDrop(x, y, xAbs, yAbs, + recommendedDropAction, + assistant); + } finally { + close(); } }); } @@ -119,14 +110,11 @@ final TransferMode recommendedDropAction) { assert dnd.isHostThread(); - return dnd.executeOnFXThread(new Callable() { - @Override - public TransferMode call() { - assert assistant != null; - return dndHandler.handleDragOver(x, y, xAbs, yAbs, - recommendedDropAction, - assistant); - } + return dnd.executeOnFXThread(() -> { + assert assistant != null; + return dndHandler.handleDragOver(x, y, xAbs, yAbs, + recommendedDropAction, + assistant); }); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedSceneDnD.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedSceneDnD.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedSceneDnD.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedSceneDnD.java @@ -108,16 +108,13 @@ final AtomicReference result = new AtomicReference<>(); final CountDownLatch l = new CountDownLatch(1); - Platform.runLater(new Runnable() { - @Override - public void run() { - try { - result.set(r.call()); - } catch (Exception z) { - // ignore - } finally { - l.countDown(); - } + Platform.runLater(() -> { + try { + result.set(r.call()); + } catch (Exception z) { + // ignore + } finally { + l.countDown(); } }); @@ -156,13 +153,10 @@ public EmbeddedSceneDTInterface createDropTarget() { setHostThread(); - return executeOnFXThread(new Callable() { - @Override - public EmbeddedSceneDTInterface call() { - assert fxDropTarget == null; - fxDropTarget = new EmbeddedSceneDT(EmbeddedSceneDnD.this, dndHandler); - return fxDropTarget; - } + return executeOnFXThread(() -> { + assert fxDropTarget == null; + fxDropTarget = new EmbeddedSceneDT(EmbeddedSceneDnD.this, dndHandler); + return fxDropTarget; }); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java @@ -184,33 +184,22 @@ private void notifyStageListener(final Runnable r) { AccessControlContext acc = getAccessControlContext(); - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - r.run(); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + r.run(); + return null; }, acc); } private void notifyStageListenerLater(final Runnable r) { - Platform.runLater(new Runnable() { - @Override - public void run() { - notifyStageListener(r); - } - }); + Platform.runLater(() -> notifyStageListener(r)); } // EmbeddedStageInterface methods @Override public void setLocation(final int x, final int y) { - Runnable r = new Runnable() { - @Override - public void run() { - if (stageListener != null) { - stageListener.changedLocation(x, y); - } + Runnable r = () -> { + if (stageListener != null) { + stageListener.changedLocation(x, y); } }; // setLocation() can be called on both FX and Swing/SWT/etc threads @@ -223,12 +212,9 @@ @Override public void setSize(final int width, final int height) { - Runnable r = new Runnable() { - @Override - public void run() { - if (stageListener != null) { - stageListener.changedSize(width, height); - } + Runnable r = () -> { + if (stageListener != null) { + stageListener.changedSize(width, height); } }; // setSize() can be called on both FX and Swing/SWT/etc threads @@ -241,13 +227,10 @@ @Override public void setFocused(final boolean focused, final int focusCause) { - Runnable r = new Runnable() { - @Override - public void run() { - if (stageListener != null) { - stageListener.changedFocused(focused, - AbstractEvents.focusCauseToPeerFocusCause(focusCause)); - } + Runnable r = () -> { + if (stageListener != null) { + stageListener.changedFocused(focused, + AbstractEvents.focusCauseToPeerFocusCause(focusCause)); } }; // setFocused() can be called on both FX and Swing/SWT/etc threads @@ -260,12 +243,9 @@ @Override public void focusUngrab() { - Runnable r = new Runnable() { - @Override - public void run() { - if (stageListener != null) { - stageListener.focusUngrab(); - } + Runnable r = () -> { + if (stageListener != null) { + stageListener.focusUngrab(); } }; if (Toolkit.getToolkit().isFxUserThread()) { diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java @@ -64,14 +64,11 @@ @Override public void setBackgroundColor(final int color) { - Application.invokeLater(new Runnable() { - @Override - public void run() { - float RR = (float) ((color >> 16) & 0xff) / 255f; - float GG = (float) ((color >> 8) & 0xff) / 255f; - float BB = (float) (color & 0xff) / 255f; - glassWindow.setBackground(RR, GG, BB); - } + Application.invokeLater(() -> { + float RR = (float) ((color >> 16) & 0xff) / 255f; + float GG = (float) ((color >> 8) & 0xff) / 255f; + float BB = (float) (color & 0xff) / 255f; + glassWindow.setBackground(RR, GG, BB); }); } @@ -82,79 +79,44 @@ @Override public void setVisible(final boolean state) { - Application.invokeLater(new Runnable() { - @Override - public void run() { - glassWindow.setVisible(state); - } - }); + Application.invokeLater(() -> glassWindow.setVisible(state)); } @Override public void setSize(final int width, final int height) { - Application.invokeLater(new Runnable() { - @Override - public void run() { - glassWindow.setSize(width, height); - } - }); + Application.invokeLater(() -> glassWindow.setSize(width, height)); } @Override public int getWidth() { final AtomicInteger width = new AtomicInteger(0); - Application.invokeAndWait(new Runnable() { - @Override - public void run() { - width.set(glassWindow.getWidth()); - } - }); + Application.invokeAndWait(() -> width.set(glassWindow.getWidth())); return width.get(); } @Override public int getHeight() { final AtomicInteger height = new AtomicInteger(0); - Application.invokeAndWait(new Runnable() { - @Override - public void run() { - height.set(glassWindow.getHeight()); - } - }); + Application.invokeAndWait(() -> height.set(glassWindow.getHeight())); return height.get(); } @Override public void setPosition(final int x, final int y) { - Application.invokeLater(new Runnable() { - @Override - public void run() { - glassWindow.setPosition(x, y); - } - }); + Application.invokeLater(() -> glassWindow.setPosition(x, y)); } @Override public int getPositionX() { final AtomicInteger x = new AtomicInteger(0); - Application.invokeAndWait(new Runnable() { - @Override - public void run() { - x.set(glassWindow.getX()); - } - }); + Application.invokeAndWait(() -> x.set(glassWindow.getX())); return x.get(); } @Override public int getPositionY() { final AtomicInteger y = new AtomicInteger(0); - Application.invokeAndWait(new Runnable() { - @Override - public void run() { - y.set(glassWindow.getY()); - } - }); + Application.invokeAndWait(() -> y.set(glassWindow.getY())); return y.get(); } @@ -181,13 +143,10 @@ @Override public int getRemoteLayerId() { final AtomicInteger id = new AtomicInteger(-1); - Application.invokeAndWait(new Runnable() { - @Override - public void run() { - View view = glassWindow.getView(); - if (view != null) { - id.set(view.getNativeRemoteLayerId(serverName)); - } + Application.invokeAndWait(() -> { + View view = glassWindow.getView(); + if (view != null) { + id.set(view.getNativeRemoteLayerId(serverName)); } }); return id.get(); @@ -195,12 +154,7 @@ @Override public void dispatchEvent(final Map eventInfo) { - Application.invokeAndWait(new Runnable() { - @Override - public void run() { - glassWindow.dispatchNpapiEvent(eventInfo); - } - }); + Application.invokeAndWait(() -> glassWindow.dispatchNpapiEvent(eventInfo)); } /** diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassScene.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassScene.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassScene.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassScene.java @@ -109,12 +109,7 @@ // JDK doesn't provide public APIs to get ACC intersection, // so using this ugly workaround accessCtrlCtx = javaSecurityAccess.doIntersectionPrivilege( - new PrivilegedAction() { - @Override - public AccessControlContext run() { - return AccessController.getContext(); - } - }, acc, ctx); + () -> AccessController.getContext(), acc, ctx); } public void waitForRenderingToComplete() { @@ -221,11 +216,9 @@ entireSceneDirty = true; sceneChanged(); } else { - Platform.runLater(new Runnable() { - @Override public void run() { - entireSceneDirty = true; - sceneChanged(); - } + Platform.runLater(() -> { + entireSceneDirty = true; + sceneChanged(); }); } } @@ -244,19 +237,16 @@ @Override public void actionPerformed(final int performedAction) { super.actionPerformed(performedAction); - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - try { - if (dragSourceListener != null) { - dragSourceListener.dragDropEnd(0, 0, 0, 0, - QuantumToolkit.clipboardActionToTransferMode(performedAction)); - } - } finally { - QuantumClipboard.releaseCurrentDragboard(); + AccessController.doPrivileged((PrivilegedAction) () -> { + try { + if (dragSourceListener != null) { + dragSourceListener.dragDropEnd(0, 0, 0, 0, + QuantumToolkit.clipboardActionToTransferMode(performedAction)); } - return null; + } finally { + QuantumClipboard.releaseCurrentDragboard(); } + return null; }, getAccessControlContext()); } }; diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java @@ -50,30 +50,24 @@ final ClipboardAssistance dropTargetAssistant) { assert Platform.isFxApplicationThread(); - return AccessController.doPrivileged(new PrivilegedAction() { - @Override - public TransferMode run() { - if (scene.dropTargetListener != null) { - QuantumClipboard dragboard = - QuantumClipboard.getDragboardInstance(dropTargetAssistant, false); - return scene.dropTargetListener.dragEnter(x, y, xAbs, yAbs, - recommendedTransferMode, dragboard); - } - return null; + return AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.dropTargetListener != null) { + QuantumClipboard dragboard = + QuantumClipboard.getDragboardInstance(dropTargetAssistant, false); + return scene.dropTargetListener.dragEnter(x, y, xAbs, yAbs, + recommendedTransferMode, dragboard); } + return null; }, scene.getAccessControlContext()); } public void handleDragLeave(final ClipboardAssistance dropTargetAssistant) { assert Platform.isFxApplicationThread(); - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.dropTargetListener != null) { - scene.dropTargetListener.dragExit(0, 0, 0, 0); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.dropTargetListener != null) { + scene.dropTargetListener.dragExit(0, 0, 0, 0); } + return null; }, scene.getAccessControlContext()); } @@ -82,15 +76,12 @@ final ClipboardAssistance dropTargetAssistant) { assert Platform.isFxApplicationThread(); - return AccessController.doPrivileged(new PrivilegedAction() { - @Override - public TransferMode run() { - if (scene.dropTargetListener != null) { - return scene.dropTargetListener.drop(x, y, xAbs, yAbs, - recommendedTransferMode); - } - return null; + return AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.dropTargetListener != null) { + return scene.dropTargetListener.drop(x, y, xAbs, yAbs, + recommendedTransferMode); } + return null; }, scene.getAccessControlContext()); } @@ -99,15 +90,12 @@ final ClipboardAssistance dropTargetAssistant) { assert Platform.isFxApplicationThread(); - return AccessController.doPrivileged(new PrivilegedAction() { - @Override - public TransferMode run() { - if (scene.dropTargetListener != null) { - return scene.dropTargetListener.dragOver(x, y, xAbs, yAbs, - recommendedTransferMode); - } - return null; + return AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.dropTargetListener != null) { + return scene.dropTargetListener.dragOver(x, y, xAbs, yAbs, + recommendedTransferMode); } + return null; }, scene.getAccessControlContext()); } @@ -121,17 +109,14 @@ final ClipboardAssistance dragSourceAssistant) { assert Platform.isFxApplicationThread(); - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.dragGestureListener != null) { - QuantumClipboard dragboard = - QuantumClipboard.getDragboardInstance(dragSourceAssistant, true); - scene.dragGestureListener.dragGestureRecognized( - x, y, xAbs, yAbs, button, dragboard); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.dragGestureListener != null) { + QuantumClipboard dragboard = + QuantumClipboard.getDragboardInstance(dragSourceAssistant, true); + scene.dragGestureListener.dragGestureRecognized( + x, y, xAbs, yAbs, button, dragboard); } + return null; }, scene.getAccessControlContext()); } @@ -142,18 +127,15 @@ final ClipboardAssistance dragSourceAssistant) { assert Platform.isFxApplicationThread(); - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - try { - if (scene.dragSourceListener != null) { - scene.dragSourceListener.dragDropEnd(0, 0, 0, 0, performedTransferMode); - } - } finally { - QuantumClipboard.releaseCurrentDragboard(); + AccessController.doPrivileged((PrivilegedAction) () -> { + try { + if (scene.dragSourceListener != null) { + scene.dragSourceListener.dragDropEnd(0, 0, 0, 0, performedTransferMode); } - return null; + } finally { + QuantumClipboard.releaseCurrentDragboard(); } + return null; }, scene.getAccessControlContext()); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassStage.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassStage.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassStage.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassStage.java @@ -117,12 +117,7 @@ // JDK doesn't provide public APIs to get ACC intersection, // so using this ugly workaround accessCtrlCtx = javaSecurityAccess.doIntersectionPrivilege( - new PrivilegedAction() { - @Override - public AccessControlContext run() { - return AccessController.getContext(); - } - }, acc, ctx); + () -> AccessController.getContext(), acc, ctx); } @Override public void requestFocus() { @@ -195,12 +190,9 @@ // In case of child windows some of them could already be closed // so check if list still contains an object if (windows.contains(window) && window.isVisible() && window.stageListener != null) { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - window.stageListener.closing(); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + window.stageListener.closing(); + return null; }, window.getAccessControlContext()); } } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java @@ -61,11 +61,9 @@ private List systemMenus = null; private MenuBar glassSystemMenuBar = null; - private InvalidationListener visibilityListener = new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - if (systemMenus != null) { - setMenus(systemMenus); - } + private InvalidationListener visibilityListener = valueModel -> { + if (systemMenus != null) { + setMenus(systemMenus); } }; @@ -135,22 +133,20 @@ final ObservableList items = mb.getItemsBase(); - items.addListener(new ListChangeListener() { - @Override public void onChanged(ListChangeListener.Change change) { - while (change.next()) { - int from = change.getFrom(); - int to = change.getTo(); - List removed = change.getRemoved(); - for (int i = from + removed.size() - 1; i >= from ; i--) { - glassMenu.remove(i); - } - for (int i = from; i < to; i++) { - MenuItemBase item = change.getList().get(i); - if (item instanceof MenuBase) { - insertMenu(glassMenu, (MenuBase)item, i); - } else { - insertMenuItem(glassMenu, item, i); - } + items.addListener((ListChangeListener.Change change) -> { + while (change.next()) { + int from = change.getFrom(); + int to = change.getTo(); + List removed = change.getRemoved(); + for (int i = from + removed.size() - 1; i >= from ; i--) { + glassMenu.remove(i); + } + for (int i = from; i < to; i++) { + MenuItemBase item = change.getList().get(i); + if (item instanceof MenuBase) { + insertMenu(glassMenu, (MenuBase)item, i); + } else { + insertMenuItem(glassMenu, item, i); } } } @@ -177,21 +173,9 @@ } private void setMenuBindings(final Menu glassMenu, final MenuBase mb) { - mb.textProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - glassMenu.setTitle(parseText(mb)); - } - }); - mb.disableProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - glassMenu.setEnabled(!mb.isDisable()); - } - }); - mb.mnemonicParsingProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - glassMenu.setTitle(parseText(mb)); - } - }); + mb.textProperty().addListener(valueModel -> glassMenu.setTitle(parseText(mb))); + mb.disableProperty().addListener(valueModel -> glassMenu.setEnabled(!mb.isDisable())); + mb.mnemonicParsingProperty().addListener(valueModel -> glassMenu.setTitle(parseText(mb))); } private void addMenuItem(Menu parent, final MenuItemBase menuitem) { @@ -246,55 +230,29 @@ final MenuItem glassSubMenuItem = app.createMenuItem(parseText(menuitem), callback); - menuitem.textProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - glassSubMenuItem.setTitle(parseText(menuitem)); - } - }); + menuitem.textProperty().addListener(valueModel -> glassSubMenuItem.setTitle(parseText(menuitem))); glassSubMenuItem.setPixels(getPixels(menuitem)); - menuitem.graphicProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - glassSubMenuItem.setPixels(getPixels(menuitem)); - } + menuitem.graphicProperty().addListener(valueModel -> { + glassSubMenuItem.setPixels(getPixels(menuitem)); }); glassSubMenuItem.setEnabled(! menuitem.isDisable()); - menuitem.disableProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - glassSubMenuItem.setEnabled(!menuitem.isDisable()); - } - }); + menuitem.disableProperty().addListener(valueModel -> glassSubMenuItem.setEnabled(!menuitem.isDisable())); setShortcut(glassSubMenuItem, menuitem); - menuitem.acceleratorProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - setShortcut(glassSubMenuItem, menuitem); - } - }); + menuitem.acceleratorProperty().addListener(valueModel -> setShortcut(glassSubMenuItem, menuitem)); - menuitem.mnemonicParsingProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - glassSubMenuItem.setTitle(parseText(menuitem)); - } - }); + menuitem.mnemonicParsingProperty().addListener(valueModel -> glassSubMenuItem.setTitle(parseText(menuitem))); if (menuitem instanceof CheckMenuItemBase) { final CheckMenuItemBase checkItem = (CheckMenuItemBase)menuitem; glassSubMenuItem.setChecked(checkItem.isSelected()); - checkItem.selectedProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - glassSubMenuItem.setChecked(checkItem.isSelected()); - } - }); + checkItem.selectedProperty().addListener(valueModel -> glassSubMenuItem.setChecked(checkItem.isSelected())); } else if (menuitem instanceof RadioMenuItemBase) { final RadioMenuItemBase radioItem = (RadioMenuItemBase)menuitem; glassSubMenuItem.setChecked(radioItem.isSelected()); - radioItem.selectedProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - glassSubMenuItem.setChecked(radioItem.isSelected()); - } - }); + radioItem.selectedProperty().addListener(valueModel -> glassSubMenuItem.setChecked(radioItem.isSelected())); } parent.insert(glassSubMenuItem, pos); diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java @@ -66,12 +66,10 @@ static boolean zoomGestureEnabled; static boolean rotateGestureEnabled; static { - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Void run() { - zoomGestureEnabled = Boolean.valueOf(System.getProperty("com.sun.javafx.gestures.zoom", "false")); - rotateGestureEnabled = Boolean.valueOf(System.getProperty("com.sun.javafx.gestures.rotate", "false")); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + zoomGestureEnabled = Boolean.valueOf(System.getProperty("com.sun.javafx.gestures.zoom", "false")); + rotateGestureEnabled = Boolean.valueOf(System.getProperty("com.sun.javafx.gestures.rotate", "false")); + return null; }); } @@ -391,14 +389,11 @@ if (stage != null) { stage.setInEventHandler(true); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - scene.sceneListener.menuEvent(x, y, xAbs, yAbs, isKeyboardTrigger); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + scene.sceneListener.menuEvent(x, y, xAbs, yAbs, isKeyboardTrigger); } + return null; }, scene.getAccessControlContext()); } finally { if (stage != null) { @@ -425,25 +420,22 @@ if (stage != null) { stage.setInEventHandler(true); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - scene.sceneListener.scrollEvent(javafx.scene.input.ScrollEvent.SCROLL, - deltaX, deltaY, 0, 0, - xMultiplier, yMultiplier, - 0, // touchCount - chars, lines, defaultChars, defaultLines, - x, y, xAbs, yAbs, - (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, - (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, - (modifiers & KeyEvent.MODIFIER_ALT) != 0, - (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, - false, // this is always indirect - false); // this has no inertia - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + scene.sceneListener.scrollEvent(ScrollEvent.SCROLL, + deltaX, deltaY, 0, 0, + xMultiplier, yMultiplier, + 0, // touchCount + chars, lines, defaultChars, defaultLines, + x, y, xAbs, yAbs, + (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, + (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, + (modifiers & KeyEvent.MODIFIER_ALT) != 0, + (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, + false, // this is always indirect + false); // this has no inertia } + return null; }, scene.getAccessControlContext()); } finally { if (stage != null) { @@ -535,20 +527,17 @@ if (stage != null) { stage.setInEventHandler(true); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - String t = text != null ? text : ""; - EventType eventType = - javafx.scene.input.InputMethodEvent.INPUT_METHOD_TEXT_CHANGED; - ObservableList composed = inputMethodEventComposed( - t, commitCount, clauseBoundary, attrBoundary, attrValue); - String committed = t.substring(0, commitCount); - scene.sceneListener.inputMethodEvent(eventType, composed, committed, cursorPos); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + String t = text != null ? text : ""; + EventType eventType = + InputMethodEvent.INPUT_METHOD_TEXT_CHANGED; + ObservableList composed = inputMethodEventComposed( + t, commitCount, clauseBoundary, attrBoundary, attrValue); + String committed = t.substring(0, commitCount); + scene.sceneListener.inputMethodEvent(eventType, composed, committed, cursorPos); } + return null; }, scene.getAccessControlContext()); } finally { if (stage != null) { @@ -820,40 +809,37 @@ if (stage != null) { stage.setInEventHandler(true); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - EventType eventType; - switch(type) { - case GestureEvent.GESTURE_STARTED: - eventType = ScrollEvent.SCROLL_STARTED; - break; - case GestureEvent.GESTURE_PERFORMED: - eventType = ScrollEvent.SCROLL; - break; - case GestureEvent.GESTURE_FINISHED: - eventType = ScrollEvent.SCROLL_FINISHED; - break; - default: - throw new RuntimeException("Unknown scroll event type: " + type); - } - scene.sceneListener.scrollEvent(eventType, dx, dy, totaldx, totaldy, - multiplierX, multiplierY, - touchCount, - 0, 0, 0, 0, - x == View.GESTURE_NO_VALUE ? Double.NaN : x, - y == View.GESTURE_NO_VALUE ? Double.NaN : y, - xAbs == View.GESTURE_NO_VALUE ? Double.NaN : xAbs, - yAbs == View.GESTURE_NO_VALUE ? Double.NaN : yAbs, - (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, - (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, - (modifiers & KeyEvent.MODIFIER_ALT) != 0, - (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, - isDirect, isInertia); + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + EventType eventType; + switch(type) { + case GestureEvent.GESTURE_STARTED: + eventType = ScrollEvent.SCROLL_STARTED; + break; + case GestureEvent.GESTURE_PERFORMED: + eventType = ScrollEvent.SCROLL; + break; + case GestureEvent.GESTURE_FINISHED: + eventType = ScrollEvent.SCROLL_FINISHED; + break; + default: + throw new RuntimeException("Unknown scroll event type: " + type); } - return null; + scene.sceneListener.scrollEvent(eventType, dx, dy, totaldx, totaldy, + multiplierX, multiplierY, + touchCount, + 0, 0, 0, 0, + x == View.GESTURE_NO_VALUE ? Double.NaN : x, + y == View.GESTURE_NO_VALUE ? Double.NaN : y, + xAbs == View.GESTURE_NO_VALUE ? Double.NaN : xAbs, + yAbs == View.GESTURE_NO_VALUE ? Double.NaN : yAbs, + (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, + (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, + (modifiers & KeyEvent.MODIFIER_ALT) != 0, + (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, + isDirect, isInertia); } + return null; }, scene.getAccessControlContext()); } finally { if (stage != null) { @@ -881,37 +867,34 @@ if (stage != null) { stage.setInEventHandler(true); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - EventType eventType; - switch (type) { - case GestureEvent.GESTURE_STARTED: - eventType = ZoomEvent.ZOOM_STARTED; - break; - case GestureEvent.GESTURE_PERFORMED: - eventType = ZoomEvent.ZOOM; - break; - case GestureEvent.GESTURE_FINISHED: - eventType = ZoomEvent.ZOOM_FINISHED; - break; - default: - throw new RuntimeException("Unknown scroll event type: " + type); - } - scene.sceneListener.zoomEvent(eventType, scale, totalscale, - originx == View.GESTURE_NO_VALUE ? Double.NaN : originx, - originy == View.GESTURE_NO_VALUE ? Double.NaN : originy, - originxAbs == View.GESTURE_NO_VALUE ? Double.NaN : originxAbs, - originyAbs == View.GESTURE_NO_VALUE ? Double.NaN : originyAbs, - (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, - (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, - (modifiers & KeyEvent.MODIFIER_ALT) != 0, - (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, - isDirect, isInertia); + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + EventType eventType; + switch (type) { + case GestureEvent.GESTURE_STARTED: + eventType = ZoomEvent.ZOOM_STARTED; + break; + case GestureEvent.GESTURE_PERFORMED: + eventType = ZoomEvent.ZOOM; + break; + case GestureEvent.GESTURE_FINISHED: + eventType = ZoomEvent.ZOOM_FINISHED; + break; + default: + throw new RuntimeException("Unknown scroll event type: " + type); } - return null; + scene.sceneListener.zoomEvent(eventType, scale, totalscale, + originx == View.GESTURE_NO_VALUE ? Double.NaN : originx, + originy == View.GESTURE_NO_VALUE ? Double.NaN : originy, + originxAbs == View.GESTURE_NO_VALUE ? Double.NaN : originxAbs, + originyAbs == View.GESTURE_NO_VALUE ? Double.NaN : originyAbs, + (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, + (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, + (modifiers & KeyEvent.MODIFIER_ALT) != 0, + (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, + isDirect, isInertia); } + return null; }, scene.getAccessControlContext()); } finally { if (stage != null) { @@ -938,37 +921,34 @@ if (stage != null) { stage.setInEventHandler(true); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - EventType eventType; - switch (type) { - case GestureEvent.GESTURE_STARTED: - eventType = RotateEvent.ROTATION_STARTED; - break; - case GestureEvent.GESTURE_PERFORMED: - eventType = RotateEvent.ROTATE; - break; - case GestureEvent.GESTURE_FINISHED: - eventType = RotateEvent.ROTATION_FINISHED; - break; - default: - throw new RuntimeException("Unknown scroll event type: " + type); - } - scene.sceneListener.rotateEvent(eventType, dangle, totalangle, - originx == View.GESTURE_NO_VALUE ? Double.NaN : originx, - originy == View.GESTURE_NO_VALUE ? Double.NaN : originy, - originxAbs == View.GESTURE_NO_VALUE ? Double.NaN : originxAbs, - originyAbs == View.GESTURE_NO_VALUE ? Double.NaN : originyAbs, - (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, - (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, - (modifiers & KeyEvent.MODIFIER_ALT) != 0, - (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, - isDirect, isInertia); + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + EventType eventType; + switch (type) { + case GestureEvent.GESTURE_STARTED: + eventType = RotateEvent.ROTATION_STARTED; + break; + case GestureEvent.GESTURE_PERFORMED: + eventType = RotateEvent.ROTATE; + break; + case GestureEvent.GESTURE_FINISHED: + eventType = RotateEvent.ROTATION_FINISHED; + break; + default: + throw new RuntimeException("Unknown scroll event type: " + type); } - return null; + scene.sceneListener.rotateEvent(eventType, dangle, totalangle, + originx == View.GESTURE_NO_VALUE ? Double.NaN : originx, + originy == View.GESTURE_NO_VALUE ? Double.NaN : originy, + originxAbs == View.GESTURE_NO_VALUE ? Double.NaN : originxAbs, + originyAbs == View.GESTURE_NO_VALUE ? Double.NaN : originyAbs, + (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, + (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, + (modifiers & KeyEvent.MODIFIER_ALT) != 0, + (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, + isDirect, isInertia); } + return null; }, scene.getAccessControlContext()); } finally { if (stage != null) { @@ -994,40 +974,37 @@ if (stage != null) { stage.setInEventHandler(true); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - EventType eventType; - switch (dir) { - case SwipeGesture.DIR_UP: - eventType = SwipeEvent.SWIPE_UP; - break; - case SwipeGesture.DIR_DOWN: - eventType = SwipeEvent.SWIPE_DOWN; - break; - case SwipeGesture.DIR_LEFT: - eventType = SwipeEvent.SWIPE_LEFT; - break; - case SwipeGesture.DIR_RIGHT: - eventType = SwipeEvent.SWIPE_RIGHT; - break; - default: - throw new RuntimeException("Unknown swipe event direction: " + dir); - } - scene.sceneListener.swipeEvent(eventType, touchCount, - x == View.GESTURE_NO_VALUE ? Double.NaN : x, - y == View.GESTURE_NO_VALUE ? Double.NaN : y, - xAbs == View.GESTURE_NO_VALUE ? Double.NaN : xAbs, - yAbs == View.GESTURE_NO_VALUE ? Double.NaN : yAbs, - (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, - (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, - (modifiers & KeyEvent.MODIFIER_ALT) != 0, - (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, - isDirect); + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + EventType eventType; + switch (dir) { + case SwipeGesture.DIR_UP: + eventType = SwipeEvent.SWIPE_UP; + break; + case SwipeGesture.DIR_DOWN: + eventType = SwipeEvent.SWIPE_DOWN; + break; + case SwipeGesture.DIR_LEFT: + eventType = SwipeEvent.SWIPE_LEFT; + break; + case SwipeGesture.DIR_RIGHT: + eventType = SwipeEvent.SWIPE_RIGHT; + break; + default: + throw new RuntimeException("Unknown swipe event direction: " + dir); } - return null; + scene.sceneListener.swipeEvent(eventType, touchCount, + x == View.GESTURE_NO_VALUE ? Double.NaN : x, + y == View.GESTURE_NO_VALUE ? Double.NaN : y, + xAbs == View.GESTURE_NO_VALUE ? Double.NaN : xAbs, + yAbs == View.GESTURE_NO_VALUE ? Double.NaN : yAbs, + (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, + (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, + (modifiers & KeyEvent.MODIFIER_ALT) != 0, + (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, + isDirect); } + return null; }, scene.getAccessControlContext()); } finally { if (stage != null) { @@ -1051,19 +1028,16 @@ if (stage != null) { stage.setInEventHandler(true); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - scene.sceneListener.touchEventBegin(time, touchEventCount, - isDirect, - (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, - (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, - (modifiers & KeyEvent.MODIFIER_ALT) != 0, - (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + scene.sceneListener.touchEventBegin(time, touchEventCount, + isDirect, + (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, + (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, + (modifiers & KeyEvent.MODIFIER_ALT) != 0, + (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0); } + return null; }, scene.getAccessControlContext()); } finally { if (stage != null) { @@ -1089,31 +1063,28 @@ if (stage != null) { stage.setInEventHandler(true); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - TouchPoint.State state; - switch (type) { - case TouchEvent.TOUCH_PRESSED: - state = TouchPoint.State.PRESSED; - break; - case TouchEvent.TOUCH_MOVED: - state = TouchPoint.State.MOVED; - break; - case TouchEvent.TOUCH_STILL: - state = TouchPoint.State.STATIONARY; - break; - case TouchEvent.TOUCH_RELEASED: - state = TouchPoint.State.RELEASED; - break; - default: - throw new RuntimeException("Unknown touch state: " + type); - } - scene.sceneListener.touchEventNext(state, touchId, x, y, xAbs, yAbs); + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + TouchPoint.State state; + switch (type) { + case TouchEvent.TOUCH_PRESSED: + state = TouchPoint.State.PRESSED; + break; + case TouchEvent.TOUCH_MOVED: + state = TouchPoint.State.MOVED; + break; + case TouchEvent.TOUCH_STILL: + state = TouchPoint.State.STATIONARY; + break; + case TouchEvent.TOUCH_RELEASED: + state = TouchPoint.State.RELEASED; + break; + default: + throw new RuntimeException("Unknown touch state: " + type); } - return null; + scene.sceneListener.touchEventNext(state, touchId, x, y, xAbs, yAbs); } + return null; }, scene.getAccessControlContext()); } finally { if (stage != null) { @@ -1136,14 +1107,11 @@ if (stage != null) { stage.setInEventHandler(true); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - scene.sceneListener.touchEventEnd(); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + scene.sceneListener.touchEventEnd(); } + return null; }, scene.getAccessControlContext()); } finally { if (stage != null) { diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/OverlayWarning.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/OverlayWarning.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/OverlayWarning.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/OverlayWarning.java @@ -66,12 +66,9 @@ overlayTransition = new SequentialTransition(); overlayTransition.getChildren().add(pause); overlayTransition.getChildren().add(fade); - overlayTransition.setOnFinished(new EventHandler() { - @Override - public void handle(ActionEvent event) { - warningTransition = false; - view.getWindowStage().setWarning(null); - } + overlayTransition.setOnFinished(event -> { + warningTransition = false; + view.getWindowStage().setWarning(null); }); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PaintCollector.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PaintCollector.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PaintCollector.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PaintCollector.java @@ -79,12 +79,10 @@ /** * Sorts the dirty scenes such that asynchronous scenes come first */ - private static final Comparator DIRTY_SCENE_SORTER = new Comparator() { - @Override public int compare(GlassScene o1, GlassScene o2) { - int i1 = o1.isSynchronous() ? 1 : 0; - int i2 = o2.isSynchronous() ? 1 : 0; - return i1 - i2; - } + private static final Comparator DIRTY_SCENE_SORTER = (o1, o2) -> { + int i1 = o1.isSynchronous() ? 1 : 0; + int i2 = o2.isSynchronous() ? 1 : 0; + return i1 - i2; }; /** @@ -326,11 +324,7 @@ ViewPainter.renderLock.unlock(); } try { - quantum.addRenderJob(new RenderJob(viewPainter, new CompletionListener() { - @Override public void done(final RenderJob rj) { - latch.countDown(); - } - })); + quantum.addRenderJob(new RenderJob(viewPainter, rj -> latch.countDown())); try { latch.await(); } catch (InterruptedException e) { diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceTrackerHelper.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceTrackerHelper.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceTrackerHelper.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceTrackerHelper.java @@ -165,13 +165,7 @@ if ((Long) getStartTimeMethod.invoke(null) <= 0) { // Standalone apps record launch time as sysprop String launchTimeString = AccessController.doPrivileged( - new PrivilegedAction() { - - @Override - public String run() { - return System.getProperty("launchTime"); - } - }); + (PrivilegedAction) () -> System.getProperty("launchTime")); if (launchTimeString != null && !launchTimeString.equals("")) { diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PrismImageLoader2.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PrismImageLoader2.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PrismImageLoader2.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PrismImageLoader2.java @@ -244,12 +244,7 @@ public PrismImageLoader2 call() throws IOException { try { return AccessController.doPrivileged( - new PrivilegedExceptionAction() { - @Override - public PrismImageLoader2 run() throws IOException { - return AsyncImageLoader.super.call(); - } - }, acc); + (PrivilegedExceptionAction) () -> AsyncImageLoader.super.call(), acc); } catch (final PrivilegedActionException e) { final Throwable cause = e.getCause(); @@ -269,35 +264,24 @@ private static ExecutorService createExecutor() { final ThreadGroup bgLoadingThreadGroup = AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public ThreadGroup run() { - return new ThreadGroup( - QuantumToolkit.getFxUserThread() - .getThreadGroup(), - "Background image loading thread pool"); - } - }); + (PrivilegedAction) () -> new ThreadGroup( + QuantumToolkit.getFxUserThread() + .getThreadGroup(), + "Background image loading thread pool") + ); final ThreadFactory bgLoadingThreadFactory = - new ThreadFactory() { - @Override - public Thread newThread(final Runnable runnable) { - return AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public Thread run() { - final Thread newThread = - new Thread(bgLoadingThreadGroup, - runnable); - newThread.setPriority( - Thread.MIN_PRIORITY); + runnable -> AccessController.doPrivileged( + (PrivilegedAction) () -> { + final Thread newThread = + new Thread(bgLoadingThreadGroup, + runnable); + newThread.setPriority( + Thread.MIN_PRIORITY); - return newThread; - } - }); - } - }; + return newThread; + } + ); final ExecutorService bgLoadingExecutor = Executors.newCachedThreadPool(bgLoadingThreadFactory); diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumRenderer.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumRenderer.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumRenderer.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumRenderer.java @@ -56,11 +56,7 @@ */ final class QuantumRenderer extends ThreadPoolExecutor { private static boolean usePurgatory = // TODO - deprecate - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - return Boolean.getBoolean("decora.purgatory"); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("decora.purgatory")); private static final AtomicReference instanceReference = @@ -139,20 +135,16 @@ @Override public Thread newThread(Runnable r) { final PipelineRunnable pipeline = new PipelineRunnable(r); _renderer = - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Thread run() { - Thread th = new Thread(pipeline); - th.setName("QuantumRenderer-" + threadNumber.getAndIncrement()); - th.setDaemon(true); - th.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { - @Override public void uncaughtException(Thread t, Throwable thr) { - System.err.println(t.getName() + " uncaught: " + thr.getClass().getName()); - thr.printStackTrace(); - } - }); - return th; - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> { + Thread th = new Thread(pipeline); + th.setName("QuantumRenderer-" + threadNumber.getAndIncrement()); + th.setDaemon(true); + th.setUncaughtExceptionHandler((t, thr) -> { + System.err.println(t.getName() + " uncaught: " + thr.getClass().getName()); + thr.printStackTrace(); + }); + return th; + }); assert threadNumber.get() == 1; @@ -163,17 +155,11 @@ protected void createResourceFactory() { final CountDownLatch createLatch = new CountDownLatch(1); - final CompletionListener createDone = new CompletionListener() { - @Override public void done(RenderJob job) { - createLatch.countDown(); - } - }; + final CompletionListener createDone = job -> createLatch.countDown(); - final Runnable factoryCreator = new Runnable() { - @Override public void run() { - ResourceFactory factory = GraphicsPipeline.getDefaultResourceFactory(); - assert factory != null; - } + final Runnable factoryCreator = () -> { + ResourceFactory factory = GraphicsPipeline.getDefaultResourceFactory(); + assert factory != null; }; final RenderJob job = new RenderJob(factoryCreator, createDone); @@ -197,11 +183,7 @@ if (presentable instanceof GraphicsResource) { final GraphicsResource resource = (GraphicsResource)presentable; - final Runnable presentableDisposer = new Runnable() { - @Override public void run() { - resource.dispose(); - } - }; + final Runnable presentableDisposer = () -> resource.dispose(); final RenderJob job = new RenderJob(presentableDisposer, null); @@ -210,12 +192,10 @@ } protected void stopRenderer() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Void run() { - shutdown(); - return null; - }; - }); + AccessController.doPrivileged((PrivilegedAction) () -> { + shutdown(); + return null; + }); if (PrismSettings.verbose) { System.out.println("QuantumRenderer: shutdown"); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java @@ -133,85 +133,59 @@ public final class QuantumToolkit extends Toolkit { public static final boolean verbose = - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - return Boolean.getBoolean("quantum.verbose"); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("quantum.verbose")); public static final boolean pulseDebug = - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - return Boolean.getBoolean("quantum.pulse"); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("quantum.pulse")); public static final boolean multithreaded = - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - // If it is not specified, or it is true, then it should - // be true. Otherwise it should be false. - String value = System.getProperty("quantum.multithreaded"); - value = value == null ? "" : value.trim(); - final boolean result = "".equals(value) || Boolean.parseBoolean(value); - if (verbose) { - System.out.println(result ? "Multi-Threading Enabled" : "Multi-Threading Disabled"); - } - return result; + AccessController.doPrivileged((PrivilegedAction) () -> { + // If it is not specified, or it is true, then it should + // be true. Otherwise it should be false. + String value = System.getProperty("quantum.multithreaded"); + value = value == null ? "" : value.trim(); + final boolean result = "".equals(value) || Boolean.parseBoolean(value); + if (verbose) { + System.out.println(result ? "Multi-Threading Enabled" : "Multi-Threading Disabled"); } + return result; }); private static boolean debug = - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - return Boolean.getBoolean("quantum.debug"); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("quantum.debug")); private static Integer pulseHZ = - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Integer run() { - return Integer.getInteger("javafx.animation.pulse"); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> Integer.getInteger("javafx.animation.pulse")); static final boolean liveResize = - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - boolean isSWT = "swt".equals(System.getProperty("glass.platform")); - String result = (PlatformUtil.isMac() || PlatformUtil.isWindows()) && !isSWT ? "true" : "false"; - return "true".equals(System.getProperty("javafx.live.resize", result)); - } + AccessController.doPrivileged((PrivilegedAction) () -> { + boolean isSWT = "swt".equals(System.getProperty("glass.platform")); + String result = (PlatformUtil.isMac() || PlatformUtil.isWindows()) && !isSWT ? "true" : "false"; + return "true".equals(System.getProperty("javafx.live.resize", result)); }); static final boolean drawInPaint = - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - boolean isSWT = "swt".equals(System.getProperty("glass.platform")); - String result = PlatformUtil.isMac() && isSWT ? "true" : "false"; - return "true".equals(System.getProperty("javafx.draw.in.paint", result));} - }); + AccessController.doPrivileged((PrivilegedAction) () -> { + boolean isSWT = "swt".equals(System.getProperty("glass.platform")); + String result = PlatformUtil.isMac() && isSWT ? "true" : "false"; + return "true".equals(System.getProperty("javafx.draw.in.paint", result));}); private static boolean singleThreaded = - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - Boolean result = Boolean.getBoolean("quantum.singlethreaded"); - if (/*verbose &&*/ result) { - System.out.println("Warning: Single GUI Threadiong is enabled, FPS should be slower"); - } - return result; + AccessController.doPrivileged((PrivilegedAction) () -> { + Boolean result = Boolean.getBoolean("quantum.singlethreaded"); + if (/*verbose &&*/ result) { + System.out.println("Warning: Single GUI Threadiong is enabled, FPS should be slower"); } + return result; }); private static boolean noRenderJobs = - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - Boolean result = Boolean.getBoolean("quantum.norenderjobs"); - if (/*verbose &&*/ result) { - System.out.println("Warning: Quantum will not submit render jobs, nothing should draw"); - } - return result; + AccessController.doPrivileged((PrivilegedAction) () -> { + Boolean result = Boolean.getBoolean("quantum.norenderjobs"); + if (/*verbose &&*/ result) { + System.out.println("Warning: Quantum will not submit render jobs, nothing should draw"); } + return result; }); private AtomicBoolean toolkitRunning = new AtomicBoolean(false); @@ -254,11 +228,9 @@ dispose(); } }; - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Void run() { - Runtime.getRuntime().addShutdownHook(shutdownHook); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + Runtime.getRuntime().addShutdownHook(shutdownHook); + return null; }); return true; } @@ -279,12 +251,7 @@ try { this.userRunnable = userStartupRunnable; - Application.run(new Runnable () { - public void run () { - // Ensure that the toolkit can only be started here - runToolkit(); - } - }); + Application.run(() -> runToolkit()); } catch (RuntimeException ex) { if (verbose) { ex.printStackTrace(); @@ -325,20 +292,14 @@ */ renderer.createResourceFactory(); - pulseRunnable = new Runnable() { - @Override public void run() { - QuantumToolkit.this.pulse(); - } - }; - timerRunnable = new Runnable() { - @Override public void run() { - try { - QuantumToolkit.this.postPulse(); - } catch (Throwable th) { - th.printStackTrace(System.err); - // } catch (RuntimeException re) { - // ignore spurious Glass timer events while exiting... - } + pulseRunnable = () -> QuantumToolkit.this.pulse(); + timerRunnable = () -> { + try { + QuantumToolkit.this.postPulse(); + } catch (Throwable th) { + th.printStackTrace(System.err); + // } catch (RuntimeException re) { + // ignore spurious Glass timer events while exiting... } }; pulseTimer = Application.GetApplication().createTimer(timerRunnable); @@ -710,11 +671,9 @@ renderer.stopRenderer(); try { - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Void run() { - Runtime.getRuntime().removeShutdownHook(shutdownHook); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + Runtime.getRuntime().removeShutdownHook(shutdownHook); + return null; }); } catch (IllegalStateException ignore) { // throw when shutdown hook already removed @@ -1395,11 +1354,7 @@ }); final CountDownLatch latch = new CountDownLatch(1); - re.setCompletionListener(new CompletionListener() { - @Override public void done(final RenderJob job) { - latch.countDown(); - } - }); + re.setCompletionListener(job -> latch.countDown()); addRenderJob(re); do { diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/RotateGestureRecognizer.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/RotateGestureRecognizer.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/RotateGestureRecognizer.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/RotateGestureRecognizer.java @@ -234,64 +234,55 @@ } private void sendRotateStartedEvent() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - scene.sceneListener.rotateEvent(RotateEvent.ROTATION_STARTED, - 0, 0, - centerX, centerY, - centerAbsX, centerAbsY, - (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, - (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, - (modifiers & KeyEvent.MODIFIER_ALT) != 0, - (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, - direct, - false /*inertia*/); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + scene.sceneListener.rotateEvent(RotateEvent.ROTATION_STARTED, + 0, 0, + centerX, centerY, + centerAbsX, centerAbsY, + (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, + (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, + (modifiers & KeyEvent.MODIFIER_ALT) != 0, + (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, + direct, + false /*inertia*/); } + return null; }, scene.getAccessControlContext()); } private void sendRotateEvent() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - scene.sceneListener.rotateEvent(RotateEvent.ROTATE, - currentRotation, totalRotation, - centerX, centerY, - centerAbsX, centerAbsY, - (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, - (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, - (modifiers & KeyEvent.MODIFIER_ALT) != 0, - (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, - direct, false /*inertia*/); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + scene.sceneListener.rotateEvent(RotateEvent.ROTATE, + currentRotation, totalRotation, + centerX, centerY, + centerAbsX, centerAbsY, + (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, + (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, + (modifiers & KeyEvent.MODIFIER_ALT) != 0, + (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, + direct, false /*inertia*/); } + return null; }, scene.getAccessControlContext()); } private void sendRotateFinishedEvent() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - scene.sceneListener.rotateEvent(RotateEvent.ROTATION_FINISHED, - 0, totalRotation, - centerX, centerY, - centerAbsX, centerAbsY, - (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, - (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, - (modifiers & KeyEvent.MODIFIER_ALT) != 0, - (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, - direct, - false /*inertia*/); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + scene.sceneListener.rotateEvent(RotateEvent.ROTATION_FINISHED, + 0, totalRotation, + centerX, centerY, + centerAbsX, centerAbsY, + (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, + (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, + (modifiers & KeyEvent.MODIFIER_ALT) != 0, + (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, + direct, + false /*inertia*/); } + return null; }, scene.getAccessControlContext()); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/SceneState.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/SceneState.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/SceneState.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/SceneState.java @@ -120,17 +120,15 @@ * @param uploadCount - the number of uploads (can be null) */ public void uploadPixels(final Pixels pixels, final AtomicInteger uploadCount) { - Application.invokeLater(new Runnable() { - @Override public void run() { - if (isValid()) { - SceneState.super.uploadPixels(pixels, uploadCount); - } else { - if (uploadCount != null) { - uploadCount.decrementAndGet(); - } + Application.invokeLater(() -> { + if (isValid()) { + SceneState.super.uploadPixels(pixels, uploadCount); + } else { + if (uploadCount != null) { + uploadCount.decrementAndGet(); } - } - }); + } + }); } Color getClearColor() { diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/SwipeGestureRecognizer.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/SwipeGestureRecognizer.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/SwipeGestureRecognizer.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/SwipeGestureRecognizer.java @@ -152,21 +152,18 @@ System.err.println("handleSwipeType swipeType=" + swipeType); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - scene.sceneListener.swipeEvent(swipeType, touchCount, - cc.getX(), cc.getY(), - cc.getAbsX(), cc.getAbsY(), - (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, - (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, - (modifiers & KeyEvent.MODIFIER_ALT) != 0, - (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, - isDirect); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + scene.sceneListener.swipeEvent(swipeType, touchCount, + cc.getX(), cc.getY(), + cc.getAbsX(), cc.getAbsY(), + (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, + (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, + (modifiers & KeyEvent.MODIFIER_ALT) != 0, + (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, + isDirect); } + return null; }, scene.getAccessControlContext()); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewScene.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewScene.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewScene.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewScene.java @@ -116,18 +116,15 @@ @Override public void setCursor(final Object cursor) { super.setCursor(cursor); - Application.invokeLater(new Runnable() { - @Override - public void run() { - final CursorFrame cursorFrame = (CursorFrame) cursor; - final Cursor platformCursor = - CursorUtils.getPlatformCursor(cursorFrame); - - if (platformView != null) { - Window window = platformView.getWindow(); - if (window != null) { - window.setCursor(platformCursor); - } + Application.invokeLater(() -> { + final CursorFrame cursorFrame = (CursorFrame) cursor; + final Cursor platformCursor = + CursorUtils.getPlatformCursor(cursorFrame); + + if (platformView != null) { + Window window = platformView.getWindow(); + if (window != null) { + window.setCursor(platformCursor); } } }); diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java @@ -671,14 +671,11 @@ isInFullScreen = true; activeFSWindow.set(this); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (stageListener != null) { - stageListener.changedFullscreen(fs); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (stageListener != null) { + stageListener.changedFullscreen(fs); } + return null; }, getAccessControlContext()); } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ZoomGestureRecognizer.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ZoomGestureRecognizer.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ZoomGestureRecognizer.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ZoomGestureRecognizer.java @@ -181,64 +181,55 @@ } private void sendZoomStartedEvent() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - scene.sceneListener.zoomEvent(ZoomEvent.ZOOM_STARTED, - 1, 1, - centerX, centerY, - centerAbsX, centerAbsY, - (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, - (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, - (modifiers & KeyEvent.MODIFIER_ALT) != 0, - (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, - direct, - false /*inertia*/); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + scene.sceneListener.zoomEvent(ZoomEvent.ZOOM_STARTED, + 1, 1, + centerX, centerY, + centerAbsX, centerAbsY, + (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, + (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, + (modifiers & KeyEvent.MODIFIER_ALT) != 0, + (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, + direct, + false /*inertia*/); } + return null; }, scene.getAccessControlContext()); } private void sendZoomEvent() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - scene.sceneListener.zoomEvent(ZoomEvent.ZOOM, - zoomFactor, totalZoomFactor, - centerX, centerY, - centerAbsX, centerAbsY, - (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, - (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, - (modifiers & KeyEvent.MODIFIER_ALT) != 0, - (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, - direct, false /*inertia*/); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + scene.sceneListener.zoomEvent(ZoomEvent.ZOOM, + zoomFactor, totalZoomFactor, + centerX, centerY, + centerAbsX, centerAbsY, + (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, + (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, + (modifiers & KeyEvent.MODIFIER_ALT) != 0, + (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, + direct, false /*inertia*/); } + return null; }, scene.getAccessControlContext()); } private void sendZoomFinishedEvent() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - if (scene.sceneListener != null) { - scene.sceneListener.zoomEvent(ZoomEvent.ZOOM_FINISHED, - 1, totalZoomFactor, - centerX, centerY, - centerAbsX, centerAbsY, - (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, - (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, - (modifiers & KeyEvent.MODIFIER_ALT) != 0, - (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, - direct, - false /*inertia*/); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (scene.sceneListener != null) { + scene.sceneListener.zoomEvent(ZoomEvent.ZOOM_FINISHED, + 1, totalZoomFactor, + centerX, centerY, + centerAbsX, centerAbsY, + (modifiers & KeyEvent.MODIFIER_SHIFT) != 0, + (modifiers & KeyEvent.MODIFIER_CONTROL) != 0, + (modifiers & KeyEvent.MODIFIER_ALT) != 0, + (modifiers & KeyEvent.MODIFIER_WINDOWS) != 0, + direct, + false /*inertia*/); } + return null; }, scene.getAccessControlContext()); } diff --git a/modules/graphics/src/main/java/com/sun/prism/d3d/D3DPipeline.java b/modules/graphics/src/main/java/com/sun/prism/d3d/D3DPipeline.java --- a/modules/graphics/src/main/java/com/sun/prism/d3d/D3DPipeline.java +++ b/modules/graphics/src/main/java/com/sun/prism/d3d/D3DPipeline.java @@ -41,17 +41,15 @@ static { - d3dEnabled = AccessController.doPrivileged(new PrivilegedAction() { - public Boolean run() { - if (PrismSettings.verbose) { - System.out.println("Loading D3D native library ..."); - } - NativeLibLoader.loadLibrary("prism_d3d"); - if (PrismSettings.verbose) { - System.out.println("\tsucceeded."); - } - return Boolean.valueOf(nInit(PrismSettings.class)); + d3dEnabled = AccessController.doPrivileged((PrivilegedAction) () -> { + if (PrismSettings.verbose) { + System.out.println("Loading D3D native library ..."); } + NativeLibLoader.loadLibrary("prism_d3d"); + if (PrismSettings.verbose) { + System.out.println("\tsucceeded."); + } + return Boolean.valueOf(nInit(PrismSettings.class)); }); if (PrismSettings.verbose) { diff --git a/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java b/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java --- a/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java +++ b/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java @@ -391,12 +391,8 @@ } try { InputStream stream = AccessController.doPrivileged( - new PrivilegedAction() { - public InputStream run() { - return D3DResourceFactory.class. - getResourceAsStream("hlsl/" + name + ".obj"); - } - } + (PrivilegedAction) () -> D3DResourceFactory.class. + getResourceAsStream("hlsl/" + name + ".obj") ); Class klass = Class.forName("com.sun.prism.shader." + name + "_Loader"); Method m = klass.getMethod("loadShader", diff --git a/modules/graphics/src/main/java/com/sun/prism/es2/EGLFBGLDrawable.java b/modules/graphics/src/main/java/com/sun/prism/es2/EGLFBGLDrawable.java --- a/modules/graphics/src/main/java/com/sun/prism/es2/EGLFBGLDrawable.java +++ b/modules/graphics/src/main/java/com/sun/prism/es2/EGLFBGLDrawable.java @@ -33,12 +33,7 @@ class EGLFBGLDrawable extends GLDrawable { private static final boolean transparentFramebuffer = - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Boolean run() { - return Boolean.getBoolean("com.sun.javafx.transparentFramebuffer"); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("com.sun.javafx.transparentFramebuffer")); private static native long nCreateDrawable(long nativeWindow, long nativeCtxInfo); private static native long nGetDummyDrawable(long nativeCtxInfo); diff --git a/modules/graphics/src/main/java/com/sun/prism/es2/ES2Pipeline.java b/modules/graphics/src/main/java/com/sun/prism/es2/ES2Pipeline.java --- a/modules/graphics/src/main/java/com/sun/prism/es2/ES2Pipeline.java +++ b/modules/graphics/src/main/java/com/sun/prism/es2/ES2Pipeline.java @@ -46,32 +46,29 @@ private static boolean isEglfb = false; static { - AccessController.doPrivileged(new PrivilegedAction() { + AccessController.doPrivileged((PrivilegedAction) () -> { + String libName = "prism_es2"; - public Void run() { - String libName = "prism_es2"; + String eglType = PlatformUtil.getEmbeddedType(); + if ("eglfb".equals(eglType)) { + isEglfb = true; + libName = "prism_es2_eglfb"; + } + else if ("monocle".equals(eglType)) { + isEglfb = true; + libName = "prism_es2_monocle"; + } + else if ("eglx11".equals(eglType)) + libName = "prism_es2_eglx11"; - String eglType = PlatformUtil.getEmbeddedType(); - if ("eglfb".equals(eglType)) { - isEglfb = true; - libName = "prism_es2_eglfb"; - } - else if ("monocle".equals(eglType)) { - isEglfb = true; - libName = "prism_es2_monocle"; - } - else if ("eglx11".equals(eglType)) - libName = "prism_es2_eglx11"; - - if (PrismSettings.verbose) { - System.out.println("Loading ES2 native library ... " + libName); - } - NativeLibLoader.loadLibrary(libName); - if (PrismSettings.verbose) { - System.out.println("\tsucceeded."); - } - return null; + if (PrismSettings.verbose) { + System.out.println("Loading ES2 native library ... " + libName); } + NativeLibLoader.loadLibrary(libName); + if (PrismSettings.verbose) { + System.out.println("\tsucceeded."); + } + return null; }); // Initialize the prism-es2 pipe and a handler of it diff --git a/modules/graphics/src/main/java/com/sun/prism/es2/GLPixelFormat.java b/modules/graphics/src/main/java/com/sun/prism/es2/GLPixelFormat.java --- a/modules/graphics/src/main/java/com/sun/prism/es2/GLPixelFormat.java +++ b/modules/graphics/src/main/java/com/sun/prism/es2/GLPixelFormat.java @@ -40,13 +40,10 @@ private static int defaultBufferSize; static { - AccessController.doPrivileged(new PrivilegedAction() { - - public Void run() { - defaultDepthSize = Integer.getInteger("prism.glDepthSize", 24); - defaultBufferSize = Integer.getInteger("prism.glBufferSize", 32); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + defaultDepthSize = Integer.getInteger("prism.glDepthSize", 24); + defaultBufferSize = Integer.getInteger("prism.glBufferSize", 32); + return null; }); } diff --git a/modules/graphics/src/main/java/com/sun/prism/es2/MonocleGLDrawable.java b/modules/graphics/src/main/java/com/sun/prism/es2/MonocleGLDrawable.java --- a/modules/graphics/src/main/java/com/sun/prism/es2/MonocleGLDrawable.java +++ b/modules/graphics/src/main/java/com/sun/prism/es2/MonocleGLDrawable.java @@ -33,12 +33,7 @@ class MonocleGLDrawable extends GLDrawable { private static final boolean transparentFramebuffer = - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Boolean run() { - return Boolean.getBoolean("com.sun.javafx.transparentFramebuffer"); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("com.sun.javafx.transparentFramebuffer")); AcceleratedScreen accScreen; diff --git a/modules/graphics/src/main/java/com/sun/prism/impl/BufferUtil.java b/modules/graphics/src/main/java/com/sun/prism/impl/BufferUtil.java --- a/modules/graphics/src/main/java/com/sun/prism/impl/BufferUtil.java +++ b/modules/graphics/src/main/java/com/sun/prism/impl/BufferUtil.java @@ -62,11 +62,7 @@ try { if (byteOrderClass == null) { byteOrderClass = (Class) AccessController.doPrivileged( - new PrivilegedExceptionAction() { - public Object run() throws ClassNotFoundException { - return Class.forName("java.nio.ByteOrder", true, null); - } - }); + (PrivilegedExceptionAction) () -> Class.forName("java.nio.ByteOrder", true, null)); orderMethod = ByteBuffer.class.getMethod("order", new Class[]{byteOrderClass}); Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", (Class[])null); nativeOrderObject = nativeOrderMethod.invoke(null, (Object[])null); diff --git a/modules/graphics/src/main/java/com/sun/prism/impl/PrismSettings.java b/modules/graphics/src/main/java/com/sun/prism/impl/PrismSettings.java --- a/modules/graphics/src/main/java/com/sun/prism/impl/PrismSettings.java +++ b/modules/graphics/src/main/java/com/sun/prism/impl/PrismSettings.java @@ -105,12 +105,7 @@ static { final Properties systemProperties = (Properties) AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public Object run() { - return System.getProperties(); - } - }); + (PrivilegedAction) () -> System.getProperties()); /* Vsync */ isVsyncEnabled = getBoolean(systemProperties, "prism.vsync", true) diff --git a/modules/graphics/src/main/java/com/sun/prism/impl/ps/BaseShaderGraphics.java b/modules/graphics/src/main/java/com/sun/prism/impl/ps/BaseShaderGraphics.java --- a/modules/graphics/src/main/java/com/sun/prism/impl/ps/BaseShaderGraphics.java +++ b/modules/graphics/src/main/java/com/sun/prism/impl/ps/BaseShaderGraphics.java @@ -510,11 +510,7 @@ private static final float FRINGE_FACTOR; static { - String v = (String) AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - return System.getProperty("prism.primshaderpad"); - } - }); + String v = (String) AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("prism.primshaderpad")); if (v == null) { FRINGE_FACTOR = -0.5f; } else { diff --git a/modules/graphics/src/main/java/com/sun/prism/impl/ps/CachingShapeRep.java b/modules/graphics/src/main/java/com/sun/prism/impl/ps/CachingShapeRep.java --- a/modules/graphics/src/main/java/com/sun/prism/impl/ps/CachingShapeRep.java +++ b/modules/graphics/src/main/java/com/sun/prism/impl/ps/CachingShapeRep.java @@ -178,16 +178,12 @@ private static class MaskCache { private static final int MAX_MASK_DIM = 512; private static final int MAX_SIZE_IN_PIXELS = 4194304; // 4 MB - private static Comparator comparator = new Comparator() { - - public int compare(CacheEntry o1, CacheEntry o2) { - int widthCompare = Float.compare(o1.xformBounds.getWidth(), o2.xformBounds.getWidth()); - if (widthCompare != 0) { - return widthCompare; - } - return Float.compare(o1.xformBounds.getHeight(), o2.xformBounds.getHeight()); + private static Comparator comparator = (o1, o2) -> { + int widthCompare = Float.compare(o1.xformBounds.getWidth(), o2.xformBounds.getWidth()); + if (widthCompare != 0) { + return widthCompare; } - + return Float.compare(o1.xformBounds.getHeight(), o2.xformBounds.getHeight()); }; private CacheEntry[] entries = new CacheEntry[8]; diff --git a/modules/graphics/src/main/java/com/sun/prism/impl/shape/NativePiscesRasterizer.java b/modules/graphics/src/main/java/com/sun/prism/impl/shape/NativePiscesRasterizer.java --- a/modules/graphics/src/main/java/com/sun/prism/impl/shape/NativePiscesRasterizer.java +++ b/modules/graphics/src/main/java/com/sun/prism/impl/shape/NativePiscesRasterizer.java @@ -65,20 +65,17 @@ int bounds[], byte mask[]); static { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - String libName = "prism_common"; + AccessController.doPrivileged((PrivilegedAction) () -> { + String libName = "prism_common"; - if (PrismSettings.verbose) { - System.out.println("Loading Prism common native library ..."); - } - NativeLibLoader.loadLibrary(libName); - if (PrismSettings.verbose) { - System.out.println("\tsucceeded."); - } - return null; + if (PrismSettings.verbose) { + System.out.println("Loading Prism common native library ..."); } + NativeLibLoader.loadLibrary(libName); + if (PrismSettings.verbose) { + System.out.println("\tsucceeded."); + } + return null; }); init(3, 3); } diff --git a/modules/graphics/src/main/java/com/sun/prism/j2d/J2DFontFactory.java b/modules/graphics/src/main/java/com/sun/prism/j2d/J2DFontFactory.java --- a/modules/graphics/src/main/java/com/sun/prism/j2d/J2DFontFactory.java +++ b/modules/graphics/src/main/java/com/sun/prism/j2d/J2DFontFactory.java @@ -110,26 +110,24 @@ */ public static void registerFont(final FontResource fr) { - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - InputStream stream = null; - try { - File file = new File(fr.getFileName()); - stream = new FileInputStream(file); - Font font = Font.createFont(Font.TRUETYPE_FONT, stream); - fr.setPeer(font); - } catch (Exception e) { - e.printStackTrace(); - } finally { - if (stream != null) { - try { - stream.close(); - } catch (Exception e2) { - } + AccessController.doPrivileged((PrivilegedAction) () -> { + InputStream stream = null; + try { + File file = new File(fr.getFileName()); + stream = new FileInputStream(file); + Font font = Font.createFont(Font.TRUETYPE_FONT, stream); + fr.setPeer(font); + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (stream != null) { + try { + stream.close(); + } catch (Exception e2) { } } - return null; } + return null; }); } @@ -172,8 +170,7 @@ synchronized (J2DFontFactory.class) { if (!compositeFontMethodsInitialized) { AccessController.doPrivileged( - new PrivilegedAction() { - public Void run() { + (PrivilegedAction) () -> { compositeFontMethodsInitialized = true; Class fontMgrCls; try { @@ -194,12 +191,12 @@ getCompositeFontUIResource = fontMgrCls.getMethod( "getCompositeFontUIResource", - java.awt.Font.class); + Font.class); } catch (NoSuchMethodException nsme) { } return null; } - }); + ); } } diff --git a/modules/graphics/src/main/java/com/sun/prism/sw/SWPipeline.java b/modules/graphics/src/main/java/com/sun/prism/sw/SWPipeline.java --- a/modules/graphics/src/main/java/com/sun/prism/sw/SWPipeline.java +++ b/modules/graphics/src/main/java/com/sun/prism/sw/SWPipeline.java @@ -38,11 +38,9 @@ public final class SWPipeline extends GraphicsPipeline { static { - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - NativeLibLoader.loadLibrary("prism_sw"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + NativeLibLoader.loadLibrary("prism_sw"); + return null; }); } diff --git a/modules/graphics/src/main/java/com/sun/scenario/animation/AbstractMasterTimer.java b/modules/graphics/src/main/java/com/sun/scenario/animation/AbstractMasterTimer.java --- a/modules/graphics/src/main/java/com/sun/scenario/animation/AbstractMasterTimer.java +++ b/modules/graphics/src/main/java/com/sun/scenario/animation/AbstractMasterTimer.java @@ -35,26 +35,6 @@ public abstract class AbstractMasterTimer { - // This PropertyChangeListener is added to Settings to listen for changes - // to the nogap and fullspeed properties. - private static Callback pcl = new Callback() { - public Void call(String key) { - switch (key) { - case FULLSPEED_PROP: - fullspeed = Settings.getBoolean(FULLSPEED_PROP); - break; - case ADAPTIVE_PULSE_PROP: - useAdaptivePulse = Settings.getBoolean(ADAPTIVE_PULSE_PROP); - break; - case ANIMATION_MBEAN_ENABLED: - AnimationPulse.getDefaultBean() - .setEnabled(Settings.getBoolean(ANIMATION_MBEAN_ENABLED)); - break; - } - return null; - } - }; - protected final static String FULLSPEED_PROP = "javafx.animation.fullspeed"; private static boolean fullspeed = Settings.getBoolean(FULLSPEED_PROP); @@ -81,6 +61,24 @@ private final int PULSE_DURATION_NS = getPulseDuration(1000000000); private final int PULSE_DURATION_TICKS = getPulseDuration((int)TickCalculation.fromMillis(1000)); + // This PropertyChangeListener is added to Settings to listen for changes + // to the nogap and fullspeed properties. + private static Callback pcl = key -> { + switch (key) { + case FULLSPEED_PROP: + fullspeed = Settings.getBoolean(FULLSPEED_PROP); + break; + case ADAPTIVE_PULSE_PROP: + useAdaptivePulse = Settings.getBoolean(ADAPTIVE_PULSE_PROP); + break; + case ANIMATION_MBEAN_ENABLED: + AnimationPulse.getDefaultBean() + .setEnabled(Settings.getBoolean(ANIMATION_MBEAN_ENABLED)); + break; + } + return null; + }; + private boolean paused = false; private long totalPausedTime; private long startPauseTime; diff --git a/modules/graphics/src/main/java/com/sun/scenario/animation/AnimationPulse.java b/modules/graphics/src/main/java/com/sun/scenario/animation/AnimationPulse.java --- a/modules/graphics/src/main/java/com/sun/scenario/animation/AnimationPulse.java +++ b/modules/graphics/src/main/java/com/sun/scenario/animation/AnimationPulse.java @@ -119,61 +119,21 @@ public long get(PulseData pulseData, TimeUnit unit); } - static final Accessor PulseStartAccessor = new Accessor() { - @Override - public long get(PulseData pulseData, TimeUnit unit) { - return pulseData.getPulseStart(unit); - } - }; + static final Accessor PulseStartAccessor = (pulseData1, unit) -> pulseData1.getPulseStart(unit); - static final Accessor AnimationDurationAccessor = new Accessor() { - @Override - public long get(PulseData pulseData, TimeUnit unit) { - return pulseData.getAnimationDuration(unit); - } - }; + static final Accessor AnimationDurationAccessor = (pulseData1, unit) -> pulseData1.getAnimationDuration(unit); - static final Accessor PaintingDurationAccessor = new Accessor() { - @Override - public long get(PulseData pulseData, TimeUnit unit) { - return pulseData.getPaintingDuration(unit); - } - }; + static final Accessor PaintingDurationAccessor = (pulseData1, unit) -> pulseData1.getPaintingDuration(unit); - static final Accessor ScenePaintingDurationAccessor = new Accessor() { - @Override - public long get(PulseData pulseData, TimeUnit unit) { - return pulseData.getScenePaintingDuration(unit); - } - }; + static final Accessor ScenePaintingDurationAccessor = (pulseData1, unit) -> pulseData1.getScenePaintingDuration(unit); - static final Accessor PulseDurationAccessor = new Accessor() { - @Override - public long get(PulseData pulseData, TimeUnit unit) { - return pulseData.getPulseDuration(unit); - } - }; + static final Accessor PulseDurationAccessor = (pulseData1, unit) -> pulseData1.getPulseDuration(unit); - static final Accessor PulseEndAccessor = new Accessor() { - @Override - public long get(PulseData pulseData, TimeUnit unit) { - return pulseData.getPulseEnd(unit); - } - }; + static final Accessor PulseEndAccessor = (pulseData1, unit) -> pulseData1.getPulseEnd(unit); - static final Accessor PaintingPreparationDuration = new Accessor() { - @Override - public long get(PulseData pulseData, TimeUnit unit) { - return pulseData.getPaintingDuration(unit); - } - }; + static final Accessor PaintingPreparationDuration = (pulseData1, unit) -> pulseData1.getPaintingDuration(unit); - static final Accessor PaintingFinalizationDuration = new Accessor() { - @Override - public long get(PulseData pulseData, TimeUnit unit) { - return pulseData.getPaintingFinalizationDuration(unit); - } - }; + static final Accessor PaintingFinalizationDuration = (pulseData1, unit) -> pulseData1.getPaintingFinalizationDuration(unit); // @Override // public String toString() { diff --git a/modules/graphics/src/main/java/com/sun/scenario/animation/shared/TimelineClipCore.java b/modules/graphics/src/main/java/com/sun/scenario/animation/shared/TimelineClipCore.java --- a/modules/graphics/src/main/java/com/sun/scenario/animation/shared/TimelineClipCore.java +++ b/modules/graphics/src/main/java/com/sun/scenario/animation/shared/TimelineClipCore.java @@ -62,12 +62,7 @@ * Note: this comparator imposes orderings that are inconsistent with * equals. */ - private static final Comparator KEY_FRAME_COMPARATOR = new Comparator() { - @Override - public int compare(KeyFrame kf1, KeyFrame kf2) { - return kf1.getTime().compareTo(kf2.getTime()); - } - }; + private static final Comparator KEY_FRAME_COMPARATOR = (kf1, kf2) -> kf1.getTime().compareTo(kf2.getTime()); // The owner of this ClipCore Timeline timeline; diff --git a/modules/graphics/src/main/java/com/sun/scenario/effect/Effect.java b/modules/graphics/src/main/java/com/sun/scenario/effect/Effect.java --- a/modules/graphics/src/main/java/com/sun/scenario/effect/Effect.java +++ b/modules/graphics/src/main/java/com/sun/scenario/effect/Effect.java @@ -57,11 +57,7 @@ private final int maxInputs; static { - AccessHelper.setStateAccessor(new AccessHelper.StateAccessor() { - public Object getState(Effect effect) { - return effect.getState(); - } - }); + AccessHelper.setStateAccessor(effect -> effect.getState()); } /** diff --git a/modules/graphics/src/main/java/com/sun/scenario/effect/ImageData.java b/modules/graphics/src/main/java/com/sun/scenario/effect/ImageData.java --- a/modules/graphics/src/main/java/com/sun/scenario/effect/ImageData.java +++ b/modules/graphics/src/main/java/com/sun/scenario/effect/ImageData.java @@ -47,25 +47,23 @@ private static HashSet alldatas; static { - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - if (System.getProperty("decora.showleaks") != null) { - alldatas = new HashSet(); - Runtime.getRuntime().addShutdownHook(new Thread() { - @Override - public void run() { - Iterator datas = alldatas.iterator(); - while (datas.hasNext()) { - ImageData id = datas.next(); - Rectangle r = id.getUntransformedBounds(); - System.out.println("id["+r.width+"x"+r.height+", refcount="+id.refcount+"] leaked from:"); - id.fromwhere.printStackTrace(System.out); - } + AccessController.doPrivileged((PrivilegedAction) () -> { + if (System.getProperty("decora.showleaks") != null) { + alldatas = new HashSet(); + Runtime.getRuntime().addShutdownHook(new Thread() { + @Override + public void run() { + Iterator datas = alldatas.iterator(); + while (datas.hasNext()) { + ImageData id = datas.next(); + Rectangle r = id.getUntransformedBounds(); + System.out.println("id["+r.width+"x"+r.height+", refcount="+id.refcount+"] leaked from:"); + id.fromwhere.printStackTrace(System.out); } - }); - } - return null; + } + }); } + return null; }); } diff --git a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/BufferUtil.java b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/BufferUtil.java --- a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/BufferUtil.java +++ b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/BufferUtil.java @@ -62,11 +62,7 @@ try { if (byteOrderClass == null) { byteOrderClass = (Class) AccessController.doPrivileged( - new PrivilegedExceptionAction() { - public Object run() throws ClassNotFoundException { - return Class.forName("java.nio.ByteOrder", true, null); - } - }); + (PrivilegedExceptionAction) () -> Class.forName("java.nio.ByteOrder", true, null)); orderMethod = ByteBuffer.class.getMethod("order", new Class[]{byteOrderClass}); Method nativeOrderMethod = byteOrderClass.getMethod("nativeOrder", (Class[])null); nativeOrderObject = nativeOrderMethod.invoke(null, (Object[])null); diff --git a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/ImagePool.java b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/ImagePool.java --- a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/ImagePool.java +++ b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/ImagePool.java @@ -48,17 +48,15 @@ static long pixelsAccessed; static { - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - if (System.getProperty("decora.showstats") != null) { - Runtime.getRuntime().addShutdownHook(new Thread() { - @Override public void run() { - printStats(); - } - }); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + if (System.getProperty("decora.showstats") != null) { + Runtime.getRuntime().addShutdownHook(new Thread() { + @Override public void run() { + printStats(); + } + }); } + return null; }); } diff --git a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/Renderer.java b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/Renderer.java --- a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/Renderer.java +++ b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/Renderer.java @@ -86,13 +86,7 @@ private final ImagePool imagePool; protected static final boolean verbose = AccessController.doPrivileged( - new PrivilegedAction() { - - public Boolean run() { - return Boolean.getBoolean("decora.verbose"); - } - - }); + (PrivilegedAction) () -> Boolean.getBoolean("decora.verbose")); protected Renderer() { this.imagePool = new ImagePool(); diff --git a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/RendererFactory.java b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/RendererFactory.java --- a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/RendererFactory.java +++ b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/RendererFactory.java @@ -180,40 +180,38 @@ } static Renderer createRenderer(final FilterContext fctx) { - return AccessController.doPrivileged(new PrivilegedAction() { - public Renderer run() { - Renderer r = null; - // Class.getSimpleName is not available on CDC - String klassName = fctx.getClass().getName(); - String simpleName = klassName.substring(klassName.lastIndexOf(".") + 1); + return AccessController.doPrivileged((PrivilegedAction) () -> { + Renderer r = null; + // Class.getSimpleName is not available on CDC + String klassName = fctx.getClass().getName(); + String simpleName = klassName.substring(klassName.lastIndexOf(".") + 1); - if (simpleName.equals("PrFilterContext") && tryPrism) { - r = createPrismRenderer(fctx); - } - // check to see whether one of the hardware accelerated - // Java 2D pipelines is in use and exposes the necessary - // "resource sharing layer" APIs (only in Sun's JDK 6u10 and above) - if (r == null && tryRSL && isRSLAvailable(fctx)) { - // try locating an RSLRenderer (need to use reflection in case - // certain RSL backend classes are not available; - // this step will trigger lazy downloading of impl jars - // via JNLP, if not already available) - r = createRSLRenderer(fctx); - } - if (r == null && tryJOGL) { - // next try the JOGL renderer - r = createJOGLRenderer(fctx); - } - if (r == null && trySIMD) { - // next try the SSE renderer - r = getSSERenderer(); - } - if (r == null) { - // otherwise, fall back on the Java/CPU renderer - r = getJavaRenderer(fctx); - } - return r; + if (simpleName.equals("PrFilterContext") && tryPrism) { + r = createPrismRenderer(fctx); } + // check to see whether one of the hardware accelerated + // Java 2D pipelines is in use and exposes the necessary + // "resource sharing layer" APIs (only in Sun's JDK 6u10 and above) + if (r == null && tryRSL && isRSLAvailable(fctx)) { + // try locating an RSLRenderer (need to use reflection in case + // certain RSL backend classes are not available; + // this step will trigger lazy downloading of impl jars + // via JNLP, if not already available) + r = createRSLRenderer(fctx); + } + if (r == null && tryJOGL) { + // next try the JOGL renderer + r = createJOGLRenderer(fctx); + } + if (r == null && trySIMD) { + // next try the SSE renderer + r = getSSERenderer(); + } + if (r == null) { + // otherwise, fall back on the Java/CPU renderer + r = getJavaRenderer(fctx); + } + return r; }); } } diff --git a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSERendererDelegate.java b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSERendererDelegate.java --- a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSERendererDelegate.java +++ b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSERendererDelegate.java @@ -37,11 +37,9 @@ public static native boolean isSupported(); static { - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - NativeLibLoader.loadLibrary("decora_sse"); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + NativeLibLoader.loadLibrary("decora_sse"); + return null; }); } diff --git a/modules/graphics/src/main/java/javafx/animation/Animation.java b/modules/graphics/src/main/java/javafx/animation/Animation.java --- a/modules/graphics/src/main/java/javafx/animation/Animation.java +++ b/modules/graphics/src/main/java/javafx/animation/Animation.java @@ -182,11 +182,9 @@ throw new IllegalStateException("Error: AccessControlContext not captured"); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Void run() { - impl_timePulse(elapsedTime); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + impl_timePulse(elapsedTime); + return null; }, accessCtrlCtx); } }; diff --git a/modules/graphics/src/main/java/javafx/animation/AnimationTimer.java b/modules/graphics/src/main/java/javafx/animation/AnimationTimer.java --- a/modules/graphics/src/main/java/javafx/animation/AnimationTimer.java +++ b/modules/graphics/src/main/java/javafx/animation/AnimationTimer.java @@ -53,11 +53,9 @@ throw new IllegalStateException("Error: AccessControlContext not captured"); } - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Void run() { - AnimationTimer.this.handle(now); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + AnimationTimer.this.handle(now); + return null; }, accessCtrlCtx); } } diff --git a/modules/graphics/src/main/java/javafx/animation/ParallelTransition.java b/modules/graphics/src/main/java/javafx/animation/ParallelTransition.java --- a/modules/graphics/src/main/java/javafx/animation/ParallelTransition.java +++ b/modules/graphics/src/main/java/javafx/animation/ParallelTransition.java @@ -114,13 +114,10 @@ private boolean childrenChanged = true; private boolean toggledRate; - private final InvalidationListener childrenListener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - childrenChanged = true; - if (getStatus() == Status.STOPPED) { - setCycleDuration(computeCycleDuration()); - } + private final InvalidationListener childrenListener = observable -> { + childrenChanged = true; + if (getStatus() == Status.STOPPED) { + setCycleDuration(computeCycleDuration()); } }; diff --git a/modules/graphics/src/main/java/javafx/animation/SequentialTransition.java b/modules/graphics/src/main/java/javafx/animation/SequentialTransition.java --- a/modules/graphics/src/main/java/javafx/animation/SequentialTransition.java +++ b/modules/graphics/src/main/java/javafx/animation/SequentialTransition.java @@ -121,13 +121,10 @@ private boolean childrenChanged = true; private boolean toggledRate; - private final InvalidationListener childrenListener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - childrenChanged = true; - if (getStatus() == Status.STOPPED) { - setCycleDuration(computeCycleDuration()); - } + private final InvalidationListener childrenListener = observable -> { + childrenChanged = true; + if (getStatus() == Status.STOPPED) { + setCycleDuration(computeCycleDuration()); } }; diff --git a/modules/graphics/src/main/java/javafx/application/Preloader.java b/modules/graphics/src/main/java/javafx/application/Preloader.java --- a/modules/graphics/src/main/java/javafx/application/Preloader.java +++ b/modules/graphics/src/main/java/javafx/application/Preloader.java @@ -115,11 +115,7 @@ private static final String lineSeparator; static { - String prop = AccessController.doPrivileged(new PrivilegedAction() { - @Override public String run() { - return System.getProperty("line.separator"); - } - }); + String prop = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("line.separator")); lineSeparator = prop != null ? prop : "\n"; } diff --git a/modules/graphics/src/main/java/javafx/concurrent/ScheduledService.java b/modules/graphics/src/main/java/javafx/concurrent/ScheduledService.java --- a/modules/graphics/src/main/java/javafx/concurrent/ScheduledService.java +++ b/modules/graphics/src/main/java/javafx/concurrent/ScheduledService.java @@ -518,11 +518,9 @@ assert task != null; return new TimerTask() { @Override public void run() { - Runnable r = new Runnable() { - @Override public void run() { - executeTaskNow(task); - delayTask = null; - } + Runnable r = () -> { + executeTaskNow(task); + delayTask = null; }; // We must make sure that executeTaskNow is called from the FX thread. diff --git a/modules/graphics/src/main/java/javafx/concurrent/Service.java b/modules/graphics/src/main/java/javafx/concurrent/Service.java --- a/modules/graphics/src/main/java/javafx/concurrent/Service.java +++ b/modules/graphics/src/main/java/javafx/concurrent/Service.java @@ -162,36 +162,23 @@ }; // Addition of doPrivileged added due to RT-19580 - private static final ThreadGroup THREAD_GROUP = AccessController.doPrivileged(new PrivilegedAction() { - @Override public ThreadGroup run() { - return new ThreadGroup("javafx concurrent thread pool"); - } - }); - private static final Thread.UncaughtExceptionHandler UNCAUGHT_HANDLER = new Thread.UncaughtExceptionHandler() { - @Override public void uncaughtException(Thread thread, Throwable throwable) { - // Ignore IllegalMonitorStateException, these are thrown from the ThreadPoolExecutor - // when a browser navigates away from a page hosting an applet that uses - // asynchronous tasks. These exceptions generally do not cause loss of functionality. - if (!(throwable instanceof IllegalMonitorStateException)) { - LOG.warning("Uncaught throwable in " + THREAD_GROUP.getName(), throwable); - } + private static final ThreadGroup THREAD_GROUP = AccessController.doPrivileged((PrivilegedAction) () -> new ThreadGroup("javafx concurrent thread pool")); + private static final Thread.UncaughtExceptionHandler UNCAUGHT_HANDLER = (thread, throwable) -> { + // Ignore IllegalMonitorStateException, these are thrown from the ThreadPoolExecutor + // when a browser navigates away from a page hosting an applet that uses + // asynchronous tasks. These exceptions generally do not cause loss of functionality. + if (!(throwable instanceof IllegalMonitorStateException)) { + LOG.warning("Uncaught throwable in " + THREAD_GROUP.getName(), throwable); } }; - private static final ThreadFactory THREAD_FACTORY = new ThreadFactory() { - @Override public Thread newThread(final Runnable run) { - // Addition of doPrivileged added due to RT-19580 - return AccessController.doPrivileged(new PrivilegedAction() { - @Override public Thread run() { - final Thread th = new Thread(THREAD_GROUP, run); - th.setUncaughtExceptionHandler(UNCAUGHT_HANDLER); - th.setPriority(Thread.MIN_PRIORITY); - th.setDaemon(true); - return th; - } - }); - } - }; + private static final ThreadFactory THREAD_FACTORY = run -> AccessController.doPrivileged((PrivilegedAction) () -> { + final Thread th = new Thread(THREAD_GROUP, run); + th.setUncaughtExceptionHandler(UNCAUGHT_HANDLER); + th.setPriority(Thread.MIN_PRIORITY); + th.setDaemon(true); + return th; + }); private static final ThreadPoolExecutor EXECUTOR = new ThreadPoolExecutor( 2, THREAD_POOL_SIZE, @@ -538,38 +525,35 @@ protected Service() { // Add a listener to the state, such that we can fire the correct event // notifications whenever the state of the Service has changed. - state.addListener(new ChangeListener() { - @Override public void changed(ObservableValue observableValue, - State old, State value) { + state.addListener((observableValue, old, value1) -> { - // Invoke the appropriate event handler - switch (value) { - case CANCELLED: - fireEvent(new WorkerStateEvent(Service.this, WORKER_STATE_CANCELLED)); - cancelled(); - break; - case FAILED: - fireEvent(new WorkerStateEvent(Service.this, WORKER_STATE_FAILED)); - failed(); - break; - case READY: - fireEvent(new WorkerStateEvent(Service.this, WORKER_STATE_READY)); - ready(); - break; - case RUNNING: - fireEvent(new WorkerStateEvent(Service.this, WORKER_STATE_RUNNING)); - running(); - break; - case SCHEDULED: - fireEvent(new WorkerStateEvent(Service.this, WORKER_STATE_SCHEDULED)); - scheduled(); - break; - case SUCCEEDED: - fireEvent(new WorkerStateEvent(Service.this, WORKER_STATE_SUCCEEDED)); - succeeded(); - break; - default: throw new AssertionError("Should be unreachable"); - } + // Invoke the appropriate event handler + switch (value1) { + case CANCELLED: + fireEvent(new WorkerStateEvent(Service.this, WORKER_STATE_CANCELLED)); + cancelled(); + break; + case FAILED: + fireEvent(new WorkerStateEvent(Service.this, WORKER_STATE_FAILED)); + failed(); + break; + case READY: + fireEvent(new WorkerStateEvent(Service.this, WORKER_STATE_READY)); + ready(); + break; + case RUNNING: + fireEvent(new WorkerStateEvent(Service.this, WORKER_STATE_RUNNING)); + running(); + break; + case SCHEDULED: + fireEvent(new WorkerStateEvent(Service.this, WORKER_STATE_SCHEDULED)); + scheduled(); + break; + case SUCCEEDED: + fireEvent(new WorkerStateEvent(Service.this, WORKER_STATE_SUCCEEDED)); + succeeded(); + break; + default: throw new AssertionError("Should be unreachable"); } }); } @@ -688,14 +672,12 @@ startedOnce = true; if (!isFxApplicationThread()) { - runLater(new Runnable() { - @Override public void run() { - // Advance the task to the "SCHEDULED" state - task.setState(State.SCHEDULED); + runLater(() -> { + // Advance the task to the "SCHEDULED" state + task.setState(State.SCHEDULED); - // Start the task - executeTask(task); - } + // Start the task + executeTask(task); }); } else { // Advance the task to the "SCHEDULED" state @@ -737,15 +719,11 @@ protected void executeTask(final Task task) { final AccessControlContext acc = AccessController.getContext(); final Executor e = getExecutor() != null ? getExecutor() : EXECUTOR; - e.execute(new Runnable() { - @Override public void run() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Void run() { - task.run(); - return null; - } - }, acc); - } + e.execute(() -> { + AccessController.doPrivileged((PrivilegedAction) () -> { + task.run(); + return null; + }, acc); }); } diff --git a/modules/graphics/src/main/java/javafx/concurrent/Task.java b/modules/graphics/src/main/java/javafx/concurrent/Task.java --- a/modules/graphics/src/main/java/javafx/concurrent/Task.java +++ b/modules/graphics/src/main/java/javafx/concurrent/Task.java @@ -1015,11 +1015,7 @@ if (isFxApplicationThread()) { setState(State.CANCELLED); } else { - runLater(new Runnable() { - @Override public void run() { - setState(State.CANCELLED); - } - }); + runLater(() -> setState(State.CANCELLED)); } } // return the flag @@ -1096,11 +1092,9 @@ if (isFxApplicationThread()) { _updateProgress(workDone, max); } else if (progressUpdate.getAndSet(new ProgressUpdate(workDone, max)) == null) { - runLater(new Runnable() { - @Override public void run() { - final ProgressUpdate update = progressUpdate.getAndSet(null); - _updateProgress(update.workDone, update.totalWork); - } + runLater(() -> { + final ProgressUpdate update = progressUpdate.getAndSet(null); + _updateProgress(update.workDone, update.totalWork); }); } } @@ -1202,11 +1196,7 @@ // to throttle the updates so as not to completely clobber // the event dispatching system. if (valueUpdate.getAndSet(value) == null) { - runLater(new Runnable() { - @Override public void run() { - Task.this.value.set(valueUpdate.getAndSet(null)); - } - }); + runLater(() -> Task.this.value.set(valueUpdate.getAndSet(null))); } } } @@ -1415,11 +1405,9 @@ // effect. But we must ensure that SCHEDULED is visited before RUNNING // in all cases so that developer code can be consistent. task.started = true; - task.runLater(new Runnable() { - @Override public void run() { - task.setState(State.SCHEDULED); - task.setState(State.RUNNING); - } + task.runLater(() -> { + task.setState(State.SCHEDULED); + task.setState(State.RUNNING); }); // Go ahead and delegate to the wrapped callable try { @@ -1427,16 +1415,14 @@ if (!task.isCancelled()) { // If it was not cancelled, then we take the return // value and set it as the result. - task.runLater(new Runnable() { - @Override public void run() { - // The result must be set first, so that when the - // SUCCEEDED flag is set, the value will be available - // The alternative is not the case, because you - // can assume if the result is set, it has - // succeeded. - task.updateValue(result); - task.setState(State.SUCCEEDED); - } + task.runLater(() -> { + // The result must be set first, so that when the + // SUCCEEDED flag is set, the value will be available + // The alternative is not the case, because you + // can assume if the result is set, it has + // succeeded. + task.updateValue(result); + task.setState(State.SUCCEEDED); }); return result; } else { @@ -1454,11 +1440,9 @@ // though the state has not yet been updated, he can infer that // it will be FAILED because it can be nothing other than FAILED // in that circumstance. - task.runLater(new Runnable() { - @Override public void run() { - task._setException(th); - task.setState(State.FAILED); - } + task.runLater(() -> { + task._setException(th); + task.setState(State.FAILED); }); // Some error occurred during the call (it might be // an exception (either runtime or checked), or it might diff --git a/modules/graphics/src/main/java/javafx/scene/Camera.java b/modules/graphics/src/main/java/javafx/scene/Camera.java --- a/modules/graphics/src/main/java/javafx/scene/Camera.java +++ b/modules/graphics/src/main/java/javafx/scene/Camera.java @@ -107,12 +107,7 @@ private Affine3D localToSceneTx = new Affine3D(); protected Camera() { - InvalidationListener dirtyTransformListener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - impl_markDirty(DirtyBits.NODE_CAMERA_TRANSFORM); - } - }; + InvalidationListener dirtyTransformListener = observable -> impl_markDirty(DirtyBits.NODE_CAMERA_TRANSFORM); this.localToSceneTransformProperty().addListener(dirtyTransformListener); // if camera is removed from scene it needs to stop using its transforms diff --git a/modules/graphics/src/main/java/javafx/scene/ImageCursor.java b/modules/graphics/src/main/java/javafx/scene/ImageCursor.java --- a/modules/graphics/src/main/java/javafx/scene/ImageCursor.java +++ b/modules/graphics/src/main/java/javafx/scene/ImageCursor.java @@ -433,12 +433,7 @@ private InvalidationListener getImageListener() { if (imageListener == null) { - imageListener = new InvalidationListener() { - @Override - public void invalidated(Observable valueModel) { - invalidateCurrentFrame(); - } - }; + imageListener = valueModel -> invalidateCurrentFrame(); } return imageListener; diff --git a/modules/graphics/src/main/java/javafx/scene/LightBase.java b/modules/graphics/src/main/java/javafx/scene/LightBase.java --- a/modules/graphics/src/main/java/javafx/scene/LightBase.java +++ b/modules/graphics/src/main/java/javafx/scene/LightBase.java @@ -87,12 +87,7 @@ } setColor(color); - this.localToSceneTransformProperty().addListener(new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - impl_markDirty(DirtyBits.NODE_LIGHT_TRANSFORM); - } - }); + this.localToSceneTransformProperty().addListener(observable -> impl_markDirty(DirtyBits.NODE_LIGHT_TRANSFORM)); } /** diff --git a/modules/graphics/src/main/java/javafx/scene/Node.java b/modules/graphics/src/main/java/javafx/scene/Node.java --- a/modules/graphics/src/main/java/javafx/scene/Node.java +++ b/modules/graphics/src/main/java/javafx/scene/Node.java @@ -757,17 +757,9 @@ return parent; } - private final InvalidationListener parentDisabledChangedListener = new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - updateDisabled(); - } - }; - - private final InvalidationListener parentTreeVisibleChangedListener = new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - updateTreeVisible(true); - } - }; + private final InvalidationListener parentDisabledChangedListener = valueModel -> updateDisabled(); + + private final InvalidationListener parentTreeVisibleChangedListener = valueModel -> updateTreeVisible(true); private SubScene subScene = null; @@ -2014,17 +2006,15 @@ // Create a deferred runnable that will be run from a pulse listener // that is called after all of the scenes have been synced but before // any of them have been rendered. - final Runnable snapshotRunnable = new Runnable() { - @Override public void run() { - WritableImage img = doSnapshot(theParams, theImage); - SnapshotResult result = new SnapshotResult(img, Node.this, theParams); + final Runnable snapshotRunnable = () -> { + WritableImage img = doSnapshot(theParams, theImage); + SnapshotResult result = new SnapshotResult(img, Node.this, theParams); // System.err.println("Calling snapshot callback"); - try { - Void v = theCallback.call(result); - } catch (Throwable th) { - System.err.println("Exception in snapshot callback"); - th.printStackTrace(System.err); - } + try { + Void v = theCallback.call(result); + } catch (Throwable th) { + System.err.println("Exception in snapshot callback"); + th.printStackTrace(System.err); } }; @@ -5355,12 +5345,7 @@ private InvalidationListener getLocalToSceneInvalidationListener() { if (localToSceneInvLstnr == null) { - localToSceneInvLstnr = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - invalidateLocalToSceneTransform(); - } - }; + localToSceneInvLstnr = observable -> invalidateLocalToSceneTransform(); } return localToSceneInvLstnr; } @@ -8150,17 +8135,13 @@ EventDispatchChain tail) { if (preprocessMouseEventDispatcher == null) { - preprocessMouseEventDispatcher = new EventDispatcher() { - @Override - public Event dispatchEvent(Event event, - EventDispatchChain tail) { - event = tail.dispatchEvent(event); - if (event instanceof MouseEvent) { - preprocessMouseEvent((MouseEvent) event); - } - - return event; - } + preprocessMouseEventDispatcher = (event, tail1) -> { + event = tail1.dispatchEvent(event); + if (event instanceof MouseEvent) { + preprocessMouseEvent((MouseEvent) event); + } + + return event; }; } @@ -9076,12 +9057,7 @@ protected abstract Bounds computeBounds(); } - private static final BoundsAccessor boundsAccessor = new BoundsAccessor() { - @Override - public BaseBounds getGeomBounds(BaseBounds bounds, BaseTransform tx, Node node) { - return node.getGeomBounds(bounds, tx); - } - }; + private static final BoundsAccessor boundsAccessor = (bounds, tx, node) -> node.getGeomBounds(bounds, tx); /** * This method is used by Scene-graph JMX bean to obtain the Scene-graph structure. diff --git a/modules/graphics/src/main/java/javafx/scene/PropertyHelper.java b/modules/graphics/src/main/java/javafx/scene/PropertyHelper.java --- a/modules/graphics/src/main/java/javafx/scene/PropertyHelper.java +++ b/modules/graphics/src/main/java/javafx/scene/PropertyHelper.java @@ -34,13 +34,10 @@ static boolean getBooleanProperty(final String propName) { try { boolean answer = - AccessController.doPrivileged(new java.security.PrivilegedAction() { - @Override - public Boolean run() { - String propVal = java.lang.System.getProperty(propName); + AccessController.doPrivileged((java.security.PrivilegedAction) () -> { + String propVal = System.getProperty(propName); return "true".equals(propVal.toLowerCase()); - } - }); + }); return answer; } catch (Exception any) { } diff --git a/modules/graphics/src/main/java/javafx/scene/Scene.java b/modules/graphics/src/main/java/javafx/scene/Scene.java --- a/modules/graphics/src/main/java/javafx/scene/Scene.java +++ b/modules/graphics/src/main/java/javafx/scene/Scene.java @@ -1250,25 +1250,23 @@ snapshotRunnableListB = new ArrayList(); snapshotRunnableList = snapshotRunnableListA; - snapshotPulseListener = new TKPulseListener() { - @Override public void pulse() { - if (snapshotRunnableList.size() > 0) { - List runnables = snapshotRunnableList; - if (snapshotRunnableList == snapshotRunnableListA) { - snapshotRunnableList = snapshotRunnableListB; - } else { - snapshotRunnableList = snapshotRunnableListA; + snapshotPulseListener = () -> { + if (snapshotRunnableList.size() > 0) { + List runnables = snapshotRunnableList; + if (snapshotRunnableList == snapshotRunnableListA) { + snapshotRunnableList = snapshotRunnableListB; + } else { + snapshotRunnableList = snapshotRunnableListA; + } + for (Runnable r : runnables) { + try { + r.run(); + } catch (Throwable th) { + System.err.println("Exception in snapshot runnable"); + th.printStackTrace(System.err); } - for (Runnable r : runnables) { - try { - r.run(); - } catch (Throwable th) { - System.err.println("Exception in snapshot runnable"); - th.printStackTrace(System.err); - } - } - runnables.clear(); } + runnables.clear(); } }; @@ -1278,15 +1276,11 @@ } final AccessControlContext acc = AccessController.getContext(); - snapshotRunnableList.add(new Runnable() { - @Override public void run() { - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Void run() { - runnable.run(); - return null; - } - }, acc); - } + snapshotRunnableList.add(() -> { + AccessController.doPrivileged((PrivilegedAction) () -> { + runnable.run(); + return null; + }, acc); }); Toolkit.getToolkit().requestNextPulse(); } @@ -1388,17 +1382,15 @@ // Create a deferred runnable that will be run from a pulse listener // that is called after all of the scenes have been synced but before // any of them have been rendered. - final Runnable snapshotRunnable = new Runnable() { - @Override public void run() { - WritableImage img = doSnapshot(theImage); + final Runnable snapshotRunnable = () -> { + WritableImage img = doSnapshot(theImage); // System.err.println("Calling snapshot callback"); - SnapshotResult result = new SnapshotResult(img, Scene.this, null); - try { - Void v = theCallback.call(result); - } catch (Throwable th) { - System.err.println("Exception in snapshot callback"); - th.printStackTrace(System.err); - } + SnapshotResult result = new SnapshotResult(img, Scene.this, null); + try { + Void v = theCallback.call(result); + } catch (Throwable th) { + System.err.println("Exception in snapshot callback"); + th.printStackTrace(System.err); } }; // System.err.println("Schedule a snapshot in the future"); @@ -3298,14 +3290,11 @@ timeout = new Timeline(); timeout.getKeyFrames().add( new KeyFrame(new Duration(toolkit.getMultiClickTime()), - new EventHandler() { - @Override - public void handle(ActionEvent event) { - out = true; - timeout = null; - } - - })); + event -> { + out = true; + timeout = null; + } + )); timeout.play(); still = true; } @@ -3865,11 +3854,7 @@ } } - private final InvalidationListener sceneWindowFocusedListener = new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - setWindowFocused(((ReadOnlyBooleanProperty)valueModel).get()); - } - }; + private final InvalidationListener sceneWindowFocusedListener = valueModel -> setWindowFocused(((ReadOnlyBooleanProperty)valueModel).get()); private void process(KeyEvent e) { final Node sceneFocusOwner = getFocusOwner(); @@ -5968,11 +5953,7 @@ private static final NodeOrientation defaultNodeOrientation = AccessController.doPrivileged( - new PrivilegedAction() { - @Override public Boolean run() { - return Boolean.getBoolean("javafx.scene.nodeOrientation.RTL"); - } - }) ? NodeOrientation.RIGHT_TO_LEFT : NodeOrientation.INHERIT; + (PrivilegedAction) () -> Boolean.getBoolean("javafx.scene.nodeOrientation.RTL")) ? NodeOrientation.RIGHT_TO_LEFT : NodeOrientation.INHERIT; diff --git a/modules/graphics/src/main/java/javafx/scene/image/Image.java b/modules/graphics/src/main/java/javafx/scene/image/Image.java --- a/modules/graphics/src/main/java/javafx/scene/image/Image.java +++ b/modules/graphics/src/main/java/javafx/scene/image/Image.java @@ -883,13 +883,8 @@ private void addKeyFrame(final int index, final double duration) { timeline.getKeyFrames().add( new KeyFrame(Duration.millis(duration), - new EventHandler() { - @Override - public void handle( - final ActionEvent event) { - updateImage(index); - } - })); + event -> updateImage(index) + )); } } diff --git a/modules/graphics/src/main/java/javafx/scene/input/Dragboard.java b/modules/graphics/src/main/java/javafx/scene/input/Dragboard.java --- a/modules/graphics/src/main/java/javafx/scene/input/Dragboard.java +++ b/modules/graphics/src/main/java/javafx/scene/input/Dragboard.java @@ -178,11 +178,8 @@ static { // This is used by classes in different packages to get access to // private and package private methods. - DragboardHelper.setDragboardAccessor(new DragboardHelper.DragboardAccessor() { - @Override - public void setDataAccessRestriction(Dragboard dragboard, boolean restricted) { - dragboard.dataAccessRestricted = restricted; - } + DragboardHelper.setDragboardAccessor((dragboard, restricted) -> { + dragboard.dataAccessRestricted = restricted; }); } } diff --git a/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java b/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java --- a/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java +++ b/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java @@ -174,11 +174,7 @@ return (Insets)getConstraint(child, MARGIN_CONSTRAINT); } - private static final Callback marginAccessor = new Callback() { - public Insets call(Node n) { - return getMargin(n); - } - }; + private static final Callback marginAccessor = n -> getMargin(n); /** * Removes all flowpane constraints from the child node. @@ -711,12 +707,7 @@ } run.height = computeMaxPrefAreaHeight(rownodes, marginAccessor, getRowValignment()); run.baselineOffset = getRowValignment() == VPos.BASELINE? - getAreaBaselineOffset(rownodes, marginAccessor, new Function() { - - public Double apply(final Integer i) { - return run.rects.get(i).width; - } - }, run.height, true) : 0; + getAreaBaselineOffset(rownodes, marginAccessor, i -> run.rects.get(i).width, run.height, true) : 0; } else { // vertical diff --git a/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java b/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java --- a/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java +++ b/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java @@ -411,11 +411,7 @@ return -1; } - private static final Callback marginAccessor = new Callback() { - public Insets call(Node n) { - return getMargin(n); - } - }; + private static final Callback marginAccessor = n -> getMargin(n); /** * Sets the horizontal alignment for the child when contained by a gridpane. @@ -732,12 +728,7 @@ */ public GridPane() { super(); - getChildren().addListener(new InvalidationListener() { - @Override - public void invalidated(Observable o) { - requestLayout(); - } - }); + getChildren().addListener((Observable o) -> requestLayout()); } /** @@ -1749,34 +1740,26 @@ if (baselineOffsets[rowIndex] == -1) { baselineOffsets[rowIndex] = getAreaBaselineOffset(rowBaseline[rowIndex], marginAccessor, - new Function() { - - @Override - public Double apply(Integer t) { - Node n = rowBaseline[rowIndex].get(t); - int c = getNodeColumnIndex(n); - int cs = getNodeColumnSpan(n); - if (cs == REMAINING) { - cs = widths.getLength() - c; - } - double w = widths.getSize(c); - for (int j = 2; j <= cs; j++) { - w += widths.getSize(c + j - 1) + snaphgap; - } - return w; + t -> { + Node n = rowBaseline[rowIndex].get(t); + int c = getNodeColumnIndex(n); + int cs = getNodeColumnSpan(n); + if (cs == REMAINING) { + cs = widths.getLength() - c; } + double w = widths.getSize(c); + for (int j = 2; j <= cs; j++) { + w += widths.getSize(c + j - 1) + snaphgap; + } + return w; }, areaH, - new Function() { - - @Override - public Boolean apply(Integer t) { - Boolean b = isFillHeight(child); - if (b != null) { - return b; - } - return shouldRowFillHeight(getNodeRowIndex(child)); + t -> { + Boolean b = isFillHeight(child); + if (b != null) { + return b; } + return shouldRowFillHeight(getNodeRowIndex(child)); }, rowMinBaselineComplement[rowIndex]); } baselineOffset = baselineOffsets[rowIndex]; diff --git a/modules/graphics/src/main/java/javafx/scene/layout/HBox.java b/modules/graphics/src/main/java/javafx/scene/layout/HBox.java --- a/modules/graphics/src/main/java/javafx/scene/layout/HBox.java +++ b/modules/graphics/src/main/java/javafx/scene/layout/HBox.java @@ -208,11 +208,7 @@ return (Insets)getConstraint(child, MARGIN_CONSTRAINT); } - private static final Callback marginAccessor = new Callback() { - public Insets call(Node n) { - return getMargin(n); - } - }; + private static final Callback marginAccessor = n -> getMargin(n); /** * Removes all hbox constraints from the child node. @@ -637,12 +633,7 @@ double baselineOffset = -1; if (alignVpos == VPos.BASELINE) { double baselineComplement = getMinBaselineComplement(); - baselineOffset = getAreaBaselineOffset(managed, marginAccessor, new Function() { - - public Double apply(Integer i) { - return actualAreaWidths[0][i]; - } - }, + baselineOffset = getAreaBaselineOffset(managed, marginAccessor, i -> actualAreaWidths[0][i], contentHeight, shouldFillHeight, baselineComplement); } diff --git a/modules/graphics/src/main/java/javafx/scene/layout/Region.java b/modules/graphics/src/main/java/javafx/scene/layout/Region.java --- a/modules/graphics/src/main/java/javafx/scene/layout/Region.java +++ b/modules/graphics/src/main/java/javafx/scene/layout/Region.java @@ -286,13 +286,7 @@ static double getAreaBaselineOffset(List children, Callback margins, Function positionToWidth, double areaHeight, final boolean fillHeight, double minComplement, boolean snapToPixel) { - return getAreaBaselineOffset(children, margins, positionToWidth, areaHeight, new Function() { - - @Override - public Boolean apply(Integer t) { - return fillHeight; - } - }, minComplement, snapToPixel); + return getAreaBaselineOffset(children, margins, positionToWidth, areaHeight, t -> fillHeight, minComplement, snapToPixel); } double getAreaBaselineOffset(List children, Callback margins, @@ -437,18 +431,16 @@ * We also are sure to remove this listener from any old BackgroundImage or * BorderImage images in the background and border property invalidation code. */ - private InvalidationListener imageChangeListener = new InvalidationListener() { - @Override public void invalidated(Observable observable) { - final ReadOnlyObjectPropertyBase imageProperty = (ReadOnlyObjectPropertyBase) observable; - final Image image = (Image) imageProperty.getBean(); - final Toolkit.ImageAccessor acc = Toolkit.getImageAccessor(); - if (image.getProgress() == 1 && !acc.isAnimation(image)) { - // We can go ahead and remove the listener since loading is done. - removeImageListener(image); - } - // Cause the region to repaint - impl_markDirty(DirtyBits.NODE_CONTENTS); + private InvalidationListener imageChangeListener = observable -> { + final ReadOnlyObjectPropertyBase imageProperty = (ReadOnlyObjectPropertyBase) observable; + final Image image = (Image) imageProperty.getBean(); + final Toolkit.ImageAccessor acc = Toolkit.getImageAccessor(); + if (image.getProgress() == 1 && !acc.isAnimation(image)) { + // We can go ahead and remove the listener since loading is done. + removeImageListener(image); } + // Cause the region to repaint + impl_markDirty(DirtyBits.NODE_CONTENTS); }; /** diff --git a/modules/graphics/src/main/java/javafx/scene/layout/StackPane.java b/modules/graphics/src/main/java/javafx/scene/layout/StackPane.java --- a/modules/graphics/src/main/java/javafx/scene/layout/StackPane.java +++ b/modules/graphics/src/main/java/javafx/scene/layout/StackPane.java @@ -182,11 +182,7 @@ return (Insets)getConstraint(child, MARGIN_CONSTRAINT); } - private static final Callback marginAccessor = new Callback() { - public Insets call(Node n) { - return getMargin(n); - } - }; + private static final Callback marginAccessor = n -> getMargin(n); /** * Removes all stackpane constraints from the child node. @@ -338,12 +334,7 @@ double contentWidth = width - left - right; double contentHeight = height - top - bottom; double baselineOffset = alignVpos == VPos.BASELINE ? - getAreaBaselineOffset(managed, marginAccessor, new Function() { - - public Double apply(Integer i) { - return width; - } - }, contentHeight, true) + getAreaBaselineOffset(managed, marginAccessor, i -> width, contentHeight, true) : 0; for (int i = 0, size = managed.size(); i < size; i++) { Node child = managed.get(i); diff --git a/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java b/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java --- a/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java +++ b/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java @@ -230,11 +230,7 @@ return (Insets)getConstraint(node, MARGIN_CONSTRAINT); } - private static final Callback marginAccessor = new Callback() { - public Insets call(Node n) { - return getMargin(n); - } - }; + private static final Callback marginAccessor = n -> getMargin(n); /** * Removes all tilepane constraints from the child node. @@ -944,12 +940,7 @@ computeContentHeight(lastColumnRemainder, getTileHeight()), vpos) : columnY; double baselineOffset = getTileAlignmentInternal().getVpos() == VPos.BASELINE ? - getAreaBaselineOffset(managed, marginAccessor, new Function() { - - public Double apply(Integer i) { - return getTileWidth(); - } - }, getTileHeight(), false) : -1; + getAreaBaselineOffset(managed, marginAccessor, i -> getTileWidth(), getTileHeight(), false) : -1; int r = 0; int c = 0; diff --git a/modules/graphics/src/main/java/javafx/scene/layout/VBox.java b/modules/graphics/src/main/java/javafx/scene/layout/VBox.java --- a/modules/graphics/src/main/java/javafx/scene/layout/VBox.java +++ b/modules/graphics/src/main/java/javafx/scene/layout/VBox.java @@ -193,11 +193,7 @@ return (Insets)getConstraint(child, MARGIN_CONSTRAINT); } - private static final Callback marginAccessor = new Callback() { - public Insets call(Node n) { - return getMargin(n); - } - }; + private static final Callback marginAccessor = n -> getMargin(n); /** * Removes all vbox constraints from the child node. diff --git a/modules/graphics/src/main/java/javafx/scene/shape/MeshView.java b/modules/graphics/src/main/java/javafx/scene/shape/MeshView.java --- a/modules/graphics/src/main/java/javafx/scene/shape/MeshView.java +++ b/modules/graphics/src/main/java/javafx/scene/shape/MeshView.java @@ -81,17 +81,12 @@ private Mesh old = null; private final ChangeListener meshChangeListener = - new ChangeListener() { - - @Override - public void changed(ObservableValue observable, - Boolean oldValue, Boolean newValue) { - if (newValue) { - impl_markDirty(DirtyBits.MESH_GEOM); - impl_geomChanged(); - } - } - }; + (observable, oldValue, newValue) -> { + if (newValue) { + impl_markDirty(DirtyBits.MESH_GEOM); + impl_geomChanged(); + } + }; private final WeakChangeListener weakMeshChangeListener = new WeakChangeListener(meshChangeListener); diff --git a/modules/graphics/src/main/java/javafx/scene/shape/Shape3D.java b/modules/graphics/src/main/java/javafx/scene/shape/Shape3D.java --- a/modules/graphics/src/main/java/javafx/scene/shape/Shape3D.java +++ b/modules/graphics/src/main/java/javafx/scene/shape/Shape3D.java @@ -105,16 +105,11 @@ private Material old = null; private final ChangeListener materialChangeListener = - new ChangeListener() { - - @Override - public void changed(ObservableValue observable, - Boolean oldValue, Boolean newValue) { - if (newValue) { - impl_markDirty(DirtyBits.MATERIAL); - } - } - }; + (observable, oldValue, newValue) -> { + if (newValue) { + impl_markDirty(DirtyBits.MATERIAL); + } + }; private final WeakChangeListener weakMaterialChangeListener = new WeakChangeListener(materialChangeListener); diff --git a/modules/graphics/src/main/java/javafx/scene/text/Text.java b/modules/graphics/src/main/java/javafx/scene/text/Text.java --- a/modules/graphics/src/main/java/javafx/scene/text/Text.java +++ b/modules/graphics/src/main/java/javafx/scene/text/Text.java @@ -112,18 +112,10 @@ * Creates an empty instance of Text. */ public Text() { - InvalidationListener listener = new InvalidationListener() { - @Override public void invalidated(Observable observable) { - checkSpan(); - } - }; + InvalidationListener listener = observable -> checkSpan(); parentProperty().addListener(listener); managedProperty().addListener(listener); - effectiveNodeOrientationProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable observable) { - checkOrientation(); - } - }); + effectiveNodeOrientationProperty().addListener(observable -> checkOrientation()); setPickOnBounds(true); } diff --git a/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java b/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java --- a/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java +++ b/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java @@ -159,11 +159,7 @@ */ public TextFlow() { super(); - effectiveNodeOrientationProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable observable) { - checkOrientation(); - } - }); + effectiveNodeOrientationProperty().addListener(observable -> checkOrientation()); } /** diff --git a/modules/graphics/src/main/java/javafx/stage/PopupWindow.java b/modules/graphics/src/main/java/javafx/stage/PopupWindow.java --- a/modules/graphics/src/main/java/javafx/stage/PopupWindow.java +++ b/modules/graphics/src/main/java/javafx/stage/PopupWindow.java @@ -122,13 +122,9 @@ * RT-28454: When a parent node or parent window we are associated with is not * visible anymore, possibly because the scene was not valid anymore, we should hide. */ - private ChangeListener changeListener = new ChangeListener() { - @Override public void changed( - ObservableValue observable, - Boolean oldValue, Boolean newValue) { - if (oldValue && !newValue) { - hide(); - } + private ChangeListener changeListener = (observable, oldValue, newValue) -> { + if (oldValue && !newValue) { + hide(); } }; @@ -866,14 +862,7 @@ private void bindOwnerFocusedProperty(final Window ownerWindowValue) { ownerFocusedListener = - new ChangeListener() { - @Override - public void changed( - ObservableValue observable, - Boolean oldValue, Boolean newValue) { - setFocused(newValue); - } - }; + (observable, oldValue, newValue) -> setFocused(newValue); ownerWindowValue.focusedProperty().addListener(ownerFocusedListener); } diff --git a/modules/graphics/src/main/java/javafx/stage/Screen.java b/modules/graphics/src/main/java/javafx/stage/Screen.java --- a/modules/graphics/src/main/java/javafx/stage/Screen.java +++ b/modules/graphics/src/main/java/javafx/stage/Screen.java @@ -72,11 +72,7 @@ FXCollections.unmodifiableObservableList(screens); static { - accessor = Toolkit.getToolkit().setScreenConfigurationListener(new TKScreenConfigurationListener() { - @Override public void screenConfigurationChanged() { - updateConfiguration(); - } - }); + accessor = Toolkit.getToolkit().setScreenConfigurationListener(() -> updateConfiguration()); } private Screen() { diff --git a/modules/graphics/src/main/java/javafx/stage/Stage.java b/modules/graphics/src/main/java/javafx/stage/Stage.java --- a/modules/graphics/src/main/java/javafx/stage/Stage.java +++ b/modules/graphics/src/main/java/javafx/stage/Stage.java @@ -176,11 +176,7 @@ return stages; } }); - StageHelper.setStageAccessor(new StageHelper.StageAccessor() { - @Override public ObservableList getStages() { - return stages; - } - }); + StageHelper.setStageAccessor(() -> stages); } private static final StagePeerListener.StageAccessor STAGE_ACCESSOR = new StagePeerListener.StageAccessor() { diff --git a/modules/graphics/src/test/java/com/sun/javafx/css/PseudoClassTest.java b/modules/graphics/src/test/java/com/sun/javafx/css/PseudoClassTest.java --- a/modules/graphics/src/test/java/com/sun/javafx/css/PseudoClassTest.java +++ b/modules/graphics/src/test/java/com/sun/javafx/css/PseudoClassTest.java @@ -856,18 +856,14 @@ nObservations = 0; ObservableSet pseudoClasses = new PseudoClassState(); - pseudoClasses.addListener(new SetChangeListener() { - - @Override - public void onChanged(SetChangeListener.Change change) { - if (change.wasAdded()) { - assert (nObservations < nObservationsExpected); - PseudoClass observed = change.getElementAdded(); - assertSame(expectedObservations[nObservations], observed); - nObservations += 1; - } else { - fail(); - } + pseudoClasses.addListener((SetChangeListener.Change change) -> { + if (change.wasAdded()) { + assert (nObservations < nObservationsExpected); + PseudoClass observed = change.getElementAdded(); + assertSame(expectedObservations[nObservations], observed); + nObservations += 1; + } else { + fail(); } }); @@ -896,18 +892,14 @@ pseudoClasses.add(expectedObservations[n]); }; - pseudoClasses.addListener(new SetChangeListener() { - - @Override - public void onChanged(SetChangeListener.Change change) { - if (change.wasRemoved()) { - assert (nObservations < nObservationsExpected); - PseudoClass observed = change.getElementRemoved(); - assertSame(expectedObservations[nObservations], observed); - nObservations += 1; - } else { - fail(); - } + pseudoClasses.addListener((SetChangeListener.Change change) -> { + if (change.wasRemoved()) { + assert (nObservations < nObservationsExpected); + PseudoClass observed = change.getElementRemoved(); + assertSame(expectedObservations[nObservations], observed); + nObservations += 1; + } else { + fail(); } }); @@ -936,18 +928,14 @@ pseudoClasses.add(expectedObservations[n]); }; - pseudoClasses.addListener(new SetChangeListener() { - - @Override - public void onChanged(SetChangeListener.Change change) { - if (change.wasRemoved()) { - assert (nObservations < nObservationsExpected); - PseudoClass observed = change.getElementRemoved(); - assertSame(expectedObservations[nObservations], observed); - nObservations += 1; - } else { - fail(); - } + pseudoClasses.addListener((SetChangeListener.Change change) -> { + if (change.wasRemoved()) { + assert (nObservations < nObservationsExpected); + PseudoClass observed = change.getElementRemoved(); + assertSame(expectedObservations[nObservations], observed); + nObservations += 1; + } else { + fail(); } }); @@ -977,18 +965,14 @@ }; ObservableSet pseudoClasses = new PseudoClassState(); - pseudoClasses.addListener(new SetChangeListener() { - - @Override - public void onChanged(SetChangeListener.Change change) { - if (change.wasAdded()) { - assert (nObservations < nObservationsExpected); - PseudoClass observed = change.getElementAdded(); - assertSame(expectedObservations[nObservations], observed); - nObservations += 1; - } else { - fail(); - } + pseudoClasses.addListener((SetChangeListener.Change change) -> { + if (change.wasAdded()) { + assert (nObservations < nObservationsExpected); + PseudoClass observed = change.getElementAdded(); + assertSame(expectedObservations[nObservations], observed); + nObservations += 1; + } else { + fail(); } }); @@ -1028,18 +1012,14 @@ master.add(pseudoClasses[n]); }; - master.addListener(new SetChangeListener() { - - @Override - public void onChanged(SetChangeListener.Change change) { - if (change.wasRemoved()) { - assert (nObservations < nObservationsExpected); - PseudoClass observed = change.getElementRemoved(); - assertSame(pseudoClassesToRemove[nObservations], observed); - nObservations += 1; - } else { - fail(); - } + master.addListener((SetChangeListener.Change change) -> { + if (change.wasRemoved()) { + assert (nObservations < nObservationsExpected); + PseudoClass observed = change.getElementRemoved(); + assertSame(pseudoClassesToRemove[nObservations], observed); + nObservations += 1; + } else { + fail(); } }); @@ -1086,18 +1066,14 @@ master.add(pseudoClasses[n]); }; - master.addListener(new SetChangeListener() { - - @Override - public void onChanged(SetChangeListener.Change change) { - if (change.wasRemoved()) { - assert (nObservations < nObservationsExpected); - PseudoClass observed = change.getElementRemoved(); - assertSame(removedPseudoClasses[nObservations], observed); - nObservations += 1; - } else { - fail(); - } + master.addListener((SetChangeListener.Change change) -> { + if (change.wasRemoved()) { + assert (nObservations < nObservationsExpected); + PseudoClass observed = change.getElementRemoved(); + assertSame(removedPseudoClasses[nObservations], observed); + nObservations += 1; + } else { + fail(); } }); @@ -1127,18 +1103,14 @@ master.add(pseudoClasses[n]); }; - master.addListener(new SetChangeListener() { - - @Override - public void onChanged(SetChangeListener.Change change) { - if (change.wasRemoved()) { - assert (nObservations < nObservationsExpected); - PseudoClass observed = change.getElementRemoved(); - assertSame(pseudoClasses[nObservations], observed); - nObservations += 1; - } else { - fail(); - } + master.addListener((SetChangeListener.Change change) -> { + if (change.wasRemoved()) { + assert (nObservations < nObservationsExpected); + PseudoClass observed = change.getElementRemoved(); + assertSame(pseudoClasses[nObservations], observed); + nObservations += 1; + } else { + fail(); } }); diff --git a/modules/graphics/src/test/java/com/sun/javafx/pgstub/StubStage.java b/modules/graphics/src/test/java/com/sun/javafx/pgstub/StubStage.java --- a/modules/graphics/src/test/java/com/sun/javafx/pgstub/StubStage.java +++ b/modules/graphics/src/test/java/com/sun/javafx/pgstub/StubStage.java @@ -306,116 +306,63 @@ @Override public void changedLocation(final float x, final float y) { - process(new Notification() { - @Override - public void execute(final TKStageListener listener) { - listener.changedLocation(x, y); - } - }); + process(listener1 -> listener1.changedLocation(x, y)); } @Override public void changedSize(final float width, final float height) { - process(new Notification() { - @Override - public void execute(final TKStageListener listener) { - listener.changedSize(width, height); - if (scene != null && width != -1 && height != -1) { - scene.getListener().changedSize(width, height); - } - } - }); + process(listener1 -> { + listener1.changedSize(width, height); + if (scene != null && width != -1 && height != -1) { + scene.getListener().changedSize(width, height); + } + }); } @Override public void changedFocused(final boolean focused, final FocusCause cause) { - process(new Notification() { - @Override - public void execute(final TKStageListener listener) { - listener.changedFocused(focused, cause); - } - }); + process(listener1 -> listener1.changedFocused(focused, cause)); } @Override public void changedIconified(final boolean iconified) { - process(new Notification() { - @Override - public void execute(final TKStageListener listener) { - listener.changedIconified(iconified); - } - }); + process(listener1 -> listener1.changedIconified(iconified)); } @Override public void changedMaximized(final boolean maximized) { - process(new Notification() { - @Override - public void execute(final TKStageListener listener) { - listener.changedMaximized(maximized); - } - }); + process(listener1 -> listener1.changedMaximized(maximized)); } public void changedAlwaysOnTop(boolean alwaysOnTop) { - process(new Notification() { - @Override - public void execute(final TKStageListener listener) { - listener.changedAlwaysOnTop(alwaysOnTop); - } - }); + process(listener1 -> listener1.changedAlwaysOnTop(alwaysOnTop)); } @Override public void changedResizable(final boolean resizable) { - process(new Notification() { - @Override - public void execute(final TKStageListener listener) { - listener.changedResizable(resizable); - } - }); + process(listener1 -> listener1.changedResizable(resizable)); } @Override public void changedFullscreen(final boolean fs) { - process(new Notification() { - @Override - public void execute(final TKStageListener listener) { - listener.changedFullscreen(fs); - } - }); + process(listener1 -> listener1.changedFullscreen(fs)); } @Override public void closing() { - process(new Notification() { - @Override - public void execute(final TKStageListener listener) { - listener.closing(); - } - }); + process(listener1 -> listener1.closing()); } @Override public void closed() { - process(new Notification() { - @Override - public void execute(final TKStageListener listener) { - listener.closed(); - } - }); + process(listener1 -> listener1.closed()); } @Override public void focusUngrab() { - process(new Notification() { - @Override - public void execute(final TKStageListener listener) { - listener.focusUngrab(); - } - }); + process(listener1 -> listener1.focusUngrab()); } private void process(final Notification notification) { diff --git a/modules/graphics/src/test/java/com/sun/javafx/pgstub/StubToolkit.java b/modules/graphics/src/test/java/com/sun/javafx/pgstub/StubToolkit.java --- a/modules/graphics/src/test/java/com/sun/javafx/pgstub/StubToolkit.java +++ b/modules/graphics/src/test/java/com/sun/javafx/pgstub/StubToolkit.java @@ -100,7 +100,7 @@ static { try { // ugly hack to initialize "runLater" method in Platform.java - PlatformImpl.startup(new Runnable() { public void run() {}}); + PlatformImpl.startup(() -> {}); } catch (Exception ex) {} // allow tests to access PG scenegraph diff --git a/modules/graphics/src/test/java/com/sun/javafx/sg/prism/NGTriangleMeshTest.java b/modules/graphics/src/test/java/com/sun/javafx/sg/prism/NGTriangleMeshTest.java --- a/modules/graphics/src/test/java/com/sun/javafx/sg/prism/NGTriangleMeshTest.java +++ b/modules/graphics/src/test/java/com/sun/javafx/sg/prism/NGTriangleMeshTest.java @@ -41,12 +41,7 @@ public void testSyncFaceSmoothingGroups() { final int[] faceSmoothingGroups = new int[]{0, 1, 2, 3, 4, 5}; NGTriangleMesh instance = new NGTriangleMesh(); - instance.syncFaceSmoothingGroups(new IntegerArraySyncer() { - - public int[] syncTo(int[] array, int[] fromAndLengthIndices) { - return faceSmoothingGroups; - } - }); + instance.syncFaceSmoothingGroups((array, fromAndLengthIndices) -> faceSmoothingGroups); int[] actuals = instance.test_getFaceSmoothingGroups(); int[] expecteds = new int[]{0, 1, 2, 3, 4, 5}; assertArrayEquals(expecteds, actuals); @@ -59,18 +54,10 @@ public void testSyncFaceSmoothingGroups2() { final int[] faceSmoothingGroups = new int[]{0, 1, 2, 3, 4, 5}; NGTriangleMesh instance = new NGTriangleMesh(); - instance.syncFaceSmoothingGroups(new IntegerArraySyncer() { - - public int[] syncTo(int[] array, int[] fromAndLengthIndices) { - return faceSmoothingGroups; - } - }); - instance.syncFaceSmoothingGroups(new IntegerArraySyncer() { - - public int[] syncTo(int[] array, int[] fromAndLengthIndices) { - Arrays.fill(array, 1, 1 + 4, 1); - return array; - } + instance.syncFaceSmoothingGroups((array, fromAndLengthIndices) -> faceSmoothingGroups); + instance.syncFaceSmoothingGroups((array, fromAndLengthIndices) -> { + Arrays.fill(array, 1, 1 + 4, 1); + return array; }); int[] actuals = instance.test_getFaceSmoothingGroups(); int[] expecteds = new int[]{0, 1, 1, 1, 1, 5}; @@ -84,12 +71,7 @@ public void testSyncPoints() { final float[] points = new float[]{0, 1, 2, 3, 4, 5}; NGTriangleMesh instance = new NGTriangleMesh(); - instance.syncPoints(new FloatArraySyncer() { - - public float[] syncTo(float[] array, int[] fromAndLengthIndices) { - return points; - } - }); + instance.syncPoints((array, fromAndLengthIndices) -> points); float[] actuals = instance.test_getPoints(); float[] expecteds = new float[]{0, 1, 2, 3, 4, 5}; assertArrayEquals(expecteds, actuals, EPSILON_FLOAT); @@ -102,18 +84,10 @@ public void testSyncPoints2() { final float[] points = new float[]{0, 1, 2, 3, 4, 5}; NGTriangleMesh instance = new NGTriangleMesh(); - instance.syncPoints(new FloatArraySyncer() { - - public float[] syncTo(float[] array, int[] fromAndLengthIndices) { - return points; - } - }); - instance.syncPoints(new FloatArraySyncer() { - - public float[] syncTo(float[] array, int[] fromAndLengthIndices) { - Arrays.fill(array, 1, 1 + 4, 1); - return array; - } + instance.syncPoints((array, fromAndLengthIndices) -> points); + instance.syncPoints((array, fromAndLengthIndices) -> { + Arrays.fill(array, 1, 1 + 4, 1); + return array; }); float[] actuals = instance.test_getPoints(); float[] expecteds = new float[]{0, 1, 1, 1, 1, 5}; @@ -127,12 +101,7 @@ public void testSyncTexCoords() { final float[] texcoords = new float[]{0, 1, 2, 3, 4, 5}; NGTriangleMesh instance = new NGTriangleMesh(); - instance.syncTexCoords(new FloatArraySyncer() { - - public float[] syncTo(float[] array, int[] fromAndLengthIndices) { - return texcoords; - } - }); + instance.syncTexCoords((array, fromAndLengthIndices) -> texcoords); float[] actuals = instance.test_getTexCoords(); float[] expecteds = new float[]{0, 1, 2, 3, 4, 5}; assertArrayEquals(expecteds, actuals, EPSILON_FLOAT); @@ -145,18 +114,10 @@ public void testSyncTexCoords2() { final float[] texcoords = new float[]{0, 1, 2, 3, 4, 5}; NGTriangleMesh instance = new NGTriangleMesh(); - instance.syncTexCoords(new FloatArraySyncer() { - - public float[] syncTo(float[] array, int[] fromAndLengthIndices) { - return texcoords; - } - }); - instance.syncTexCoords(new FloatArraySyncer() { - - public float[] syncTo(float[] array, int[] fromAndLengthIndices) { - Arrays.fill(array, 1, 1 + 4, 1); - return array; - } + instance.syncTexCoords((array, fromAndLengthIndices) -> texcoords); + instance.syncTexCoords((array, fromAndLengthIndices) -> { + Arrays.fill(array, 1, 1 + 4, 1); + return array; }); float[] actuals = instance.test_getTexCoords(); float[] expecteds = new float[]{0, 1, 1, 1, 1, 5}; @@ -170,12 +131,7 @@ public void testSyncFaces() { final int[] faces = new int[]{0, 1, 2, 3, 4, 5}; NGTriangleMesh instance = new NGTriangleMesh(); - instance.syncFaces(new IntegerArraySyncer() { - - public int[] syncTo(int[] array, int[] fromAndLengthIndices) { - return faces; - } - }); + instance.syncFaces((array, fromAndLengthIndices) -> faces); int[] actuals = instance.test_getFaces(); int[] expecteds = new int[]{0, 1, 2, 3, 4, 5}; assertArrayEquals(expecteds, actuals); @@ -188,18 +144,10 @@ public void testSyncFaces2() { final int[] faces = new int[]{0, 1, 2, 3, 4, 5}; NGTriangleMesh instance = new NGTriangleMesh(); - instance.syncFaces(new IntegerArraySyncer() { - - public int[] syncTo(int[] array, int[] fromAndLengthIndices) { - return faces; - } - }); - instance.syncFaces(new IntegerArraySyncer() { - - public int[] syncTo(int[] array, int[] fromAndLengthIndices) { - Arrays.fill(array, 1, 1 + 4, 1); - return array; - } + instance.syncFaces((array, fromAndLengthIndices) -> faces); + instance.syncFaces((array, fromAndLengthIndices) -> { + Arrays.fill(array, 1, 1 + 4, 1); + return array; }); int[] actuals = instance.test_getFaces(); int[] expecteds = new int[]{0, 1, 1, 1, 1, 5}; diff --git a/modules/graphics/src/test/java/com/sun/javafx/test/ObjectMethodsTestBase.java b/modules/graphics/src/test/java/com/sun/javafx/test/ObjectMethodsTestBase.java --- a/modules/graphics/src/test/java/com/sun/javafx/test/ObjectMethodsTestBase.java +++ b/modules/graphics/src/test/java/com/sun/javafx/test/ObjectMethodsTestBase.java @@ -132,113 +132,89 @@ } public static final TestInstance EQUAL_OBJECTS_EQUALS_TEST = - new TestInstance() { - @Override - public void test(final Object[] objects) { - for (int i = 0; i < objects.length; ++i) { - for (int j = 0; j < objects.length; ++j) { - assertEquals(objects[i], objects[j]); - } - assertFalse(objects[i].equals(null)); + objects -> { + for (int i = 0; i < objects.length; ++i) { + for (int j = 0; j < objects.length; ++j) { + assertEquals(objects[i], objects[j]); } + assertFalse(objects[i].equals(null)); } }; public static final TestInstance EQUAL_OBJECTS_HASHCODE_TEST = - new TestInstance() { - @Override - public void test(final Object[] objects) { - for (int i = 0; i < objects.length; ++i) { - for (int j = 0; j < objects.length; ++j) { - assertEquals(objects[i].hashCode(), - objects[j].hashCode()); - } + objects -> { + for (int i = 0; i < objects.length; ++i) { + for (int j = 0; j < objects.length; ++j) { + assertEquals(objects[i].hashCode(), + objects[j].hashCode()); } } }; public static final TestInstance EQUAL_OBJECTS_TOSTRING_TEST = - new TestInstance() { - @Override - public void test(final Object[] objects) { - for (int i = 0; i < objects.length; ++i) { - for (int j = 0; j < objects.length; ++j) { - assertEquals(objects[i].toString(), - objects[j].toString()); - } + objects -> { + for (int i = 0; i < objects.length; ++i) { + for (int j = 0; j < objects.length; ++j) { + assertEquals(objects[i].toString(), + objects[j].toString()); } } }; public static final TestInstance DIFFERENT_OBJECTS_EQUALS_TEST = - new TestInstance() { - @Override - public void test(final Object[] objects) { - for (int i = 0; i < objects.length; ++i) { - for (int j = 0; j < objects.length; ++j) { - if (i != j) { - assertFalse(objects[i].equals(objects[j])); - } + objects -> { + for (int i = 0; i < objects.length; ++i) { + for (int j = 0; j < objects.length; ++j) { + if (i != j) { + assertFalse(objects[i].equals(objects[j])); } - assertFalse(objects[i].equals(null)); } + assertFalse(objects[i].equals(null)); } }; public static final TestInstance DIFFERENT_OBJECTS_EASY_HASHCODE_TEST = - new TestInstance() { - @Override - public void test(final Object[] objects) { - // if objects are different, their hashcodes can return the - // same or different values - } + objects -> { + // if objects are different, their hashcodes can return the + // same or different values }; public static final TestInstance DIFFERENT_OBJECTS_MEDIUM_HASHCODE_TEST = - new TestInstance() { - @Override - public void test(final Object[] objects) { - // we require that at least one tested object returns a - // different hash code value - final int firstHashCodeValue = objects[0].hashCode(); - for (int i = 1; i < objects.length; ++i) { - if (objects[i].hashCode() != firstHashCodeValue) { - return; - } + objects -> { + // we require that at least one tested object returns a + // different hash code value + final int firstHashCodeValue = objects[0].hashCode(); + for (int i = 1; i < objects.length; ++i) { + if (objects[i].hashCode() != firstHashCodeValue) { + return; } + } - // all the hash codes are same, this violates our criteria - fail(); - } + // all the hash codes are same, this violates our criteria + fail(); }; public static final TestInstance DIFFERENT_OBJECTS_HARD_HASHCODE_TEST = - new TestInstance() { - @Override - public void test(final Object[] objects) { - // we require that at all tested objects returns a different - // hash code value - for (int i = 0; i < objects.length; ++i) { - for (int j = 0; j < objects.length; ++j) { - if (i != j) { - assertNotSame(objects[i].hashCode(), - objects[j].hashCode()); - } + objects -> { + // we require that at all tested objects returns a different + // hash code value + for (int i = 0; i < objects.length; ++i) { + for (int j = 0; j < objects.length; ++j) { + if (i != j) { + assertNotSame(objects[i].hashCode(), + objects[j].hashCode()); } } } }; public static final TestInstance DIFFERENT_OBJECTS_TOSTRING_TEST = - new TestInstance() { - @Override - public void test(final Object[] objects) { - for (int i = 0; i < objects.length; ++i) { - for (int j = 0; j < objects.length; ++j) { - if (i != j) { - assertFalse(objects[i].toString().equals( - objects[j].toString())); - } + objects -> { + for (int i = 0; i < objects.length; ++i) { + for (int j = 0; j < objects.length; ++j) { + if (i != j) { + assertFalse(objects[i].toString().equals( + objects[j].toString())); } } } diff --git a/modules/graphics/src/test/java/com/sun/scenario/SettingsTest.java b/modules/graphics/src/test/java/com/sun/scenario/SettingsTest.java --- a/modules/graphics/src/test/java/com/sun/scenario/SettingsTest.java +++ b/modules/graphics/src/test/java/com/sun/scenario/SettingsTest.java @@ -63,13 +63,9 @@ @Test public void testListener() { - final Callback listener = new Callback() { - - @Override - public Void call(String key) { - tmp = Settings.get(key); - return null; - } + final Callback listener = key -> { + tmp = Settings.get(key); + return null; }; Settings.addPropertyChangeListener(listener); Settings.set("foo", "bar"); diff --git a/modules/graphics/src/test/java/com/sun/scenario/animation/AbstractMasterTimerTest.java b/modules/graphics/src/test/java/com/sun/scenario/animation/AbstractMasterTimerTest.java --- a/modules/graphics/src/test/java/com/sun/scenario/animation/AbstractMasterTimerTest.java +++ b/modules/graphics/src/test/java/com/sun/scenario/animation/AbstractMasterTimerTest.java @@ -95,12 +95,7 @@ public void testPulseReceiver() { final Flag flag = new Flag(); - final PulseReceiver pulseReceiver = new PulseReceiver() { - @Override - public void timePulse(long now) { - flag.flag(); - } - }; + final PulseReceiver pulseReceiver = now -> flag.flag(); // add PulseReceiver timer.addPulseReceiver(pulseReceiver); @@ -125,11 +120,7 @@ } }; - final TimerReceiver timerReceiver = new TimerReceiver() { - @Override public void handle(long l) { - animationTimer.handle(l); - } - }; + final TimerReceiver timerReceiver = l -> animationTimer.handle(l); // add AnimationTimer timer.addAnimationTimer(timerReceiver); diff --git a/modules/graphics/src/test/java/com/sun/scenario/animation/shared/TimelineClipCoreTest.java b/modules/graphics/src/test/java/com/sun/scenario/animation/shared/TimelineClipCoreTest.java --- a/modules/graphics/src/test/java/com/sun/scenario/animation/shared/TimelineClipCoreTest.java +++ b/modules/graphics/src/test/java/com/sun/scenario/animation/shared/TimelineClipCoreTest.java @@ -98,12 +98,10 @@ tmpBool = false; final KeyFrame newMiddle = new KeyFrame( Duration.millis(500), - new EventHandler() { - @Override - public void handle(ActionEvent event) { - tmpBool = true; - } - }); + event -> { + tmpBool = true; + } + ); timeline.getKeyFrames().set(1, newMiddle); core.playTo(6 * 1000); @@ -189,12 +187,10 @@ tmpBool = false; final KeyFrame newMiddle = new KeyFrame( Duration.millis(500), - new EventHandler() { - @Override - public void handle(ActionEvent event) { - tmpBool = true; - } - }); + event -> { + tmpBool = true; + } + ); timeline.getKeyFrames().set(1, newMiddle); core.jumpTo(6 * 600, false); diff --git a/modules/graphics/src/test/java/javafx/animation/AnimationMock.java b/modules/graphics/src/test/java/javafx/animation/AnimationMock.java --- a/modules/graphics/src/test/java/javafx/animation/AnimationMock.java +++ b/modules/graphics/src/test/java/javafx/animation/AnimationMock.java @@ -61,11 +61,8 @@ setRate(rate); setCycleCount(cycleCount); setAutoReverse(autoReverse); - super.setOnFinished(new EventHandler() { - @Override - public void handle(ActionEvent event) { - finishFlag = true; - } + super.setOnFinished(event -> { + finishFlag = true; }); } diff --git a/modules/graphics/src/test/java/javafx/animation/KeyFrameTest.java b/modules/graphics/src/test/java/javafx/animation/KeyFrameTest.java --- a/modules/graphics/src/test/java/javafx/animation/KeyFrameTest.java +++ b/modules/graphics/src/test/java/javafx/animation/KeyFrameTest.java @@ -48,9 +48,7 @@ private static final KeyValue[] NO_KEYVALUES = new KeyValue[0]; private static final List NO_KEYVALUES_COL = Arrays.asList(NO_KEYVALUES); private static final String NAME = "KeyFrameName"; - private static final EventHandler ACTION = new EventHandler() { - @Override public void handle(ActionEvent event) {} - }; + private static final EventHandler ACTION = event -> {}; private final IntegerProperty TARGET = new SimpleIntegerProperty(); private final KeyValue[] ONE_KEYVALUE = new KeyValue[] { diff --git a/modules/graphics/src/test/java/javafx/concurrent/ScheduledServiceTest.java b/modules/graphics/src/test/java/javafx/concurrent/ScheduledServiceTest.java --- a/modules/graphics/src/test/java/javafx/concurrent/ScheduledServiceTest.java +++ b/modules/graphics/src/test/java/javafx/concurrent/ScheduledServiceTest.java @@ -43,11 +43,7 @@ * Tests for the ScheduledService. */ public class ScheduledServiceTest extends ServiceTestBase { - private static final Callback EPIC_FAIL_FACTORY = new Callback() { - @Override public AbstractTask call(Void param) { - return new EpicFailTask(); - } - }; + private static final Callback EPIC_FAIL_FACTORY = param -> new EpicFailTask(); /** * The service that we're going to test. Because a ScheduledService @@ -610,15 +606,11 @@ @Test public void cumulativePeriodResetOnSuccessfulRun() { final AtomicInteger counter = new AtomicInteger(); - taskFactory = new Callback() { - @Override public AbstractTask call(Void param) { - return new AbstractTask() { - @Override protected String call() throws Exception { - int c = counter.incrementAndGet(); - if (c < 10) throw new Exception("Kaboom!"); - return "Success"; - } - }; + taskFactory = param -> new AbstractTask() { + @Override protected String call() throws Exception { + int c = counter.incrementAndGet(); + if (c < 10) throw new Exception("Kaboom!"); + return "Success"; } }; s.setPeriod(Duration.seconds(1)); @@ -759,15 +751,11 @@ @Test public void lastValueIsSetAfterFailedFirstIterationAndSuccessfulSecondIteration() { final AtomicInteger counter = new AtomicInteger(); - taskFactory = new Callback() { - @Override public AbstractTask call(Void param) { - return new AbstractTask() { - @Override protected String call() throws Exception { - int c = counter.incrementAndGet(); - if (c == 1) throw new Exception("Bombed out!"); - return "Success"; - } - }; + taskFactory = param -> new AbstractTask() { + @Override protected String call() throws Exception { + int c = counter.incrementAndGet(); + if (c == 1) throw new Exception("Bombed out!"); + return "Success"; } }; s.start(); @@ -780,15 +768,11 @@ @Test public void lastValueIsUnchangedAfterSuccessfulFirstIterationAndFailedSecondIteration() { final AtomicInteger counter = new AtomicInteger(); - taskFactory = new Callback() { - @Override public AbstractTask call(Void param) { - return new AbstractTask() { - @Override protected String call() throws Exception { - int c = counter.incrementAndGet(); - if (c == 1) return "Success"; - throw new Exception("Bombed out!"); - } - }; + taskFactory = param -> new AbstractTask() { + @Override protected String call() throws Exception { + int c = counter.incrementAndGet(); + if (c == 1) return "Success"; + throw new Exception("Bombed out!"); } }; s.start(); @@ -812,31 +796,17 @@ AtomicBoolean onReadyCalled = new AtomicBoolean(); AtomicBoolean onScheduledCalled = new AtomicBoolean(); AtomicBoolean onCancelledCalled = new AtomicBoolean(); - s.setOnSucceeded(new EventHandler() { - @Override public void handle(WorkerStateEvent event) { - s.cancel(); - // Reset these so that they only get set to true if called - // after the cancel step - onReadyCalled.set(false); - onScheduledCalled.set(false); - onCancelledCalled.set(false); - } + s.setOnSucceeded(event -> { + s.cancel(); + // Reset these so that they only get set to true if called + // after the cancel step + onReadyCalled.set(false); + onScheduledCalled.set(false); + onCancelledCalled.set(false); }); - s.setOnReady(new EventHandler() { - @Override public void handle(WorkerStateEvent event) { - onReadyCalled.set(true); - } - }); - s.setOnScheduled(new EventHandler() { - @Override public void handle(WorkerStateEvent event) { - onScheduledCalled.set(true); - } - }); - s.setOnCancelled(new EventHandler() { - @Override public void handle(WorkerStateEvent event) { - onCancelledCalled.set(true); - } - }); + s.setOnReady(event -> onReadyCalled.set(true)); + s.setOnScheduled(event -> onScheduledCalled.set(true)); + s.setOnCancelled(event -> onCancelledCalled.set(true)); s.start(); assertFalse(s.isRunning()); diff --git a/modules/graphics/src/test/java/javafx/concurrent/ServiceExceptionTest.java b/modules/graphics/src/test/java/javafx/concurrent/ServiceExceptionTest.java --- a/modules/graphics/src/test/java/javafx/concurrent/ServiceExceptionTest.java +++ b/modules/graphics/src/test/java/javafx/concurrent/ServiceExceptionTest.java @@ -85,12 +85,7 @@ @Test public void exceptionPropertyNotification() { final AtomicBoolean passed = new AtomicBoolean(false); - service.exceptionProperty().addListener(new ChangeListener() { - @Override public void changed(ObservableValue o, - Throwable oldValue, Throwable newValue) { - passed.set(newValue == exception); - } - }); + service.exceptionProperty().addListener((o, oldValue, newValue) -> passed.set(newValue == exception)); service.start(); handleEvents(); assertTrue(passed.get()); @@ -115,12 +110,7 @@ @Test public void runningPropertyNotification() { final AtomicBoolean passed = new AtomicBoolean(false); - service.runningProperty().addListener(new ChangeListener() { - @Override public void changed(ObservableValue o, - Boolean oldValue, Boolean newValue) { - passed.set(!newValue); - } - }); + service.runningProperty().addListener((o, oldValue, newValue) -> passed.set(!newValue)); service.start(); handleEvents(); assertTrue(passed.get()); @@ -135,12 +125,7 @@ @Test public void workDonePropertyNotification() { final AtomicBoolean passed = new AtomicBoolean(false); - service.workDoneProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, Number oldValue, Number newValue) { - passed.set(newValue.doubleValue() == 10); - } - }); + service.workDoneProperty().addListener((observable, oldValue, newValue) -> passed.set(newValue.doubleValue() == 10)); service.start(); handleEvents(); assertTrue(passed.get()); @@ -155,12 +140,7 @@ @Test public void totalWorkPropertyNotification() { final AtomicBoolean passed = new AtomicBoolean(false); - service.totalWorkProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, Number oldValue, Number newValue) { - passed.set(newValue.doubleValue() == 20); - } - }); + service.totalWorkProperty().addListener((observable, oldValue, newValue) -> passed.set(newValue.doubleValue() == 20)); service.start(); handleEvents(); assertTrue(passed.get()); @@ -175,12 +155,7 @@ @Test public void progressPropertyNotification() { final AtomicBoolean passed = new AtomicBoolean(false); - service.progressProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, Number oldValue, Number newValue) { - passed.set(newValue.doubleValue() == .5); - } - }); + service.progressProperty().addListener((observable, oldValue, newValue) -> passed.set(newValue.doubleValue() == .5)); service.start(); handleEvents(); assertTrue(passed.get()); @@ -195,12 +170,7 @@ @Test public void statePropertyNotification() { final AtomicBoolean passed = new AtomicBoolean(false); - service.stateProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, Worker.State oldValue, Worker.State newValue) { - passed.set(newValue == Worker.State.FAILED); - } - }); + service.stateProperty().addListener((observable, oldValue, newValue) -> passed.set(newValue == Worker.State.FAILED)); service.start(); handleEvents(); assertTrue(passed.get()); @@ -215,12 +185,7 @@ @Test public void messagePropertyNotification() { final AtomicBoolean passed = new AtomicBoolean(false); - service.messageProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, String oldValue, String newValue) { - passed.set("About to fail".equals(service.getMessage())); - } - }); + service.messageProperty().addListener((observable, oldValue, newValue) -> passed.set("About to fail".equals(service.getMessage()))); service.start(); handleEvents(); assertTrue(passed.get()); @@ -235,12 +200,7 @@ @Test public void titlePropertyNotification() { final AtomicBoolean passed = new AtomicBoolean(false); - service.titleProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, String oldValue, String newValue) { - passed.set("Epic Fail".equals(service.getTitle())); - } - }); + service.titleProperty().addListener((observable, oldValue, newValue) -> passed.set("Epic Fail".equals(service.getTitle()))); service.start(); handleEvents(); assertTrue(passed.get()); diff --git a/modules/graphics/src/test/java/javafx/concurrent/ServiceLifecycleTest.java b/modules/graphics/src/test/java/javafx/concurrent/ServiceLifecycleTest.java --- a/modules/graphics/src/test/java/javafx/concurrent/ServiceLifecycleTest.java +++ b/modules/graphics/src/test/java/javafx/concurrent/ServiceLifecycleTest.java @@ -262,13 +262,7 @@ @Test public void runningPropertyNotificationInScheduledState() { final AtomicBoolean passed = new AtomicBoolean(false); - service.runningProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue o, - Boolean oldValue, Boolean newValue) { - passed.set(newValue); - } - }); + service.runningProperty().addListener((o, oldValue, newValue) -> passed.set(newValue)); service.start(); assertTrue(passed.get()); } @@ -360,13 +354,7 @@ @Test public void runningPropertyNotificationInRunningState() { final AtomicBoolean passed = new AtomicBoolean(false); - service.runningProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue o, - Boolean oldValue, Boolean newValue) { - passed.set(newValue); - } - }); + service.runningProperty().addListener((o, oldValue, newValue) -> passed.set(newValue)); service.start(); executor.executeScheduled(); assertTrue(passed.get()); @@ -389,13 +377,7 @@ @Test public void workDonePropertyNotification() { final AtomicBoolean passed = new AtomicBoolean(false); - service.workDoneProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue o, - Number oldValue, Number newValue) { - passed.set(newValue.doubleValue() == 10); - } - }); + service.workDoneProperty().addListener((o, oldValue, newValue) -> passed.set(newValue.doubleValue() == 10)); service.start(); executor.executeScheduled(); task.progress(10, 20); @@ -419,13 +401,7 @@ @Test public void totalWorkPropertyNotification() { final AtomicBoolean passed = new AtomicBoolean(false); - service.totalWorkProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue o, - Number oldValue, Number newValue) { - passed.set(newValue.doubleValue() == 20); - } - }); + service.totalWorkProperty().addListener((o, oldValue, newValue) -> passed.set(newValue.doubleValue() == 20)); service.start(); executor.executeScheduled(); task.progress(10, 20); @@ -450,13 +426,7 @@ @Test public void progressPropertyNotification() { final AtomicBoolean passed = new AtomicBoolean(false); service.start(); - task.progressProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue o, - Number oldValue, Number newValue) { - passed.set(newValue.doubleValue() == .5); - } - }); + task.progressProperty().addListener((o, oldValue, newValue) -> passed.set(newValue.doubleValue() == .5)); executor.executeScheduled(); task.progress(10, 20); assertTrue(passed.get()); @@ -480,13 +450,7 @@ @Test public void messagePropertyNotification() { final AtomicBoolean passed = new AtomicBoolean(false); service.start(); - task.messageProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue o, - String oldValue, String newValue) { - passed.set("Running".equals(service.getMessage())); - } - }); + task.messageProperty().addListener((o, oldValue, newValue) -> passed.set("Running".equals(service.getMessage()))); executor.executeScheduled(); task.message("Running"); assertTrue(passed.get()); @@ -510,13 +474,7 @@ @Test public void titlePropertyNotification() { final AtomicBoolean passed = new AtomicBoolean(false); service.start(); - task.titleProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue o, - String oldValue, String newValue) { - passed.set("Title".equals(service.getTitle())); - } - }); + task.titleProperty().addListener((o, oldValue, newValue) -> passed.set("Title".equals(service.getTitle()))); executor.executeScheduled(); task.title("Title"); assertTrue(passed.get()); @@ -806,16 +764,8 @@ service.start(); executor.executeScheduled(); task.complete(); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_READY, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }); - service.setOnReady(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalledFirst.set(filterCalled.get()); - } - }); + service.addEventFilter(WorkerStateEvent.WORKER_STATE_READY, workerStateEvent -> filterCalled.set(true)); + service.setOnReady(workerStateEvent -> filterCalledFirst.set(filterCalled.get())); // Transition to Ready state service.reset(); @@ -828,12 +778,7 @@ service.start(); executor.executeScheduled(); task.complete(); - service.addEventHandler(WorkerStateEvent.WORKER_STATE_READY, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + service.addEventHandler(WorkerStateEvent.WORKER_STATE_READY, workerStateEvent -> handlerCalled.set(true)); // Transition to Ready state service.reset(); @@ -847,19 +792,10 @@ service.start(); executor.executeScheduled(); task.complete(); - EventHandler handler = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }; + EventHandler handler = workerStateEvent -> handlerCalled.set(true); service.addEventHandler(WorkerStateEvent.WORKER_STATE_READY, handler); service.removeEventHandler(WorkerStateEvent.WORKER_STATE_READY, handler); - service.addEventHandler(WorkerStateEvent.WORKER_STATE_READY, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + service.addEventHandler(WorkerStateEvent.WORKER_STATE_READY, workerStateEvent -> sanity.set(true)); service.reset(); assertTrue(sanity.get()); @@ -872,19 +808,10 @@ service.start(); executor.executeScheduled(); task.complete(); - EventHandler filter = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }; + EventHandler filter = workerStateEvent -> filterCalled.set(true); service.addEventFilter(WorkerStateEvent.WORKER_STATE_READY, filter); service.removeEventFilter(WorkerStateEvent.WORKER_STATE_READY, filter); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_READY, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + service.addEventFilter(WorkerStateEvent.WORKER_STATE_READY, workerStateEvent -> sanity.set(true)); service.reset(); assertTrue(sanity.get()); @@ -896,15 +823,11 @@ service.start(); executor.executeScheduled(); task.complete(); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_READY, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - service.cancel(); - } + service.addEventFilter(WorkerStateEvent.WORKER_STATE_READY, workerStateEvent -> { + service.cancel(); }); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, new EventHandler() { - @Override public void handle(WorkerStateEvent event) { - cancelNotificationCount.incrementAndGet(); - } + service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, event -> { + cancelNotificationCount.incrementAndGet(); }); service.reset(); @@ -934,17 +857,8 @@ @Test public void onScheduledFilterCalledBefore_onScheduled() { final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean filterCalledFirst = new AtomicBoolean(false); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }); - service.setOnScheduled(new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - filterCalledFirst.set(filterCalled.get()); - } - }); + service.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, workerStateEvent -> filterCalled.set(true)); + service.setOnScheduled(workerStateEvent -> filterCalledFirst.set(filterCalled.get())); // Transition to Scheduled state service.start(); @@ -955,12 +869,7 @@ @Test public void scheduledCalledAfterHandler() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.setOnScheduled(new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + service.setOnScheduled(workerStateEvent -> handlerCalled.set(true)); // Transition to Scheduled state service.start(); @@ -971,11 +880,9 @@ @Test public void scheduledCalledAfterHandlerEvenIfConsumed() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.setOnScheduled(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - workerStateEvent.consume(); - } + service.setOnScheduled(workerStateEvent -> { + handlerCalled.set(true); + workerStateEvent.consume(); }); // Transition to Scheduled state @@ -987,12 +894,7 @@ @Test public void onScheduledHandlerCalled() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.addEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + service.addEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, workerStateEvent -> handlerCalled.set(true)); service.start(); executor.executeScheduled(); @@ -1003,18 +905,10 @@ @Test public void removed_onScheduledHandlerNotCalled() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); final AtomicBoolean sanity = new AtomicBoolean(false); - EventHandler handler = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }; + EventHandler handler = workerStateEvent -> handlerCalled.set(true); service.addEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, handler); service.removeEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, handler); - service.addEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + service.addEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, workerStateEvent -> sanity.set(true)); service.start(); executor.executeScheduled(); @@ -1025,19 +919,10 @@ @Test public void removed_onScheduledFilterNotCalled() { final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean sanity = new AtomicBoolean(false); - EventHandler filter = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }; + EventHandler filter = workerStateEvent -> filterCalled.set(true); service.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, filter); service.removeEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, filter); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + service.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, workerStateEvent -> sanity.set(true)); service.start(); executor.executeScheduled(); @@ -1047,15 +932,11 @@ @Test public void cancelCalledFromOnScheduled() { final AtomicInteger cancelNotificationCount = new AtomicInteger(); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - service.cancel(); - } + service.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, workerStateEvent -> { + service.cancel(); }); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, new EventHandler() { - @Override public void handle(WorkerStateEvent event) { - cancelNotificationCount.incrementAndGet(); - } + service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, event -> { + cancelNotificationCount.incrementAndGet(); }); service.start(); @@ -1086,17 +967,8 @@ @Test public void onRunningFilterCalledBefore_onRunning() { final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean filterCalledFirst = new AtomicBoolean(false); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_RUNNING, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }); - service.setOnRunning(new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - filterCalledFirst.set(filterCalled.get()); - } - }); + service.addEventFilter(WorkerStateEvent.WORKER_STATE_RUNNING, workerStateEvent -> filterCalled.set(true)); + service.setOnRunning(workerStateEvent -> filterCalledFirst.set(filterCalled.get())); // Transition to Running state service.start(); @@ -1107,11 +979,7 @@ @Test public void runningCalledAfterHandler() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.setOnRunning(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + service.setOnRunning(workerStateEvent -> handlerCalled.set(true)); // Transition to Running state service.start(); @@ -1122,12 +990,9 @@ @Test public void runningCalledAfterHandlerEvenIfConsumed() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.setOnRunning(new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - workerStateEvent.consume(); - } + service.setOnRunning(workerStateEvent -> { + handlerCalled.set(true); + workerStateEvent.consume(); }); // Transition to Running state @@ -1139,12 +1004,7 @@ @Test public void onRunningHandlerCalled() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.addEventHandler(WorkerStateEvent.WORKER_STATE_RUNNING, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + service.addEventHandler(WorkerStateEvent.WORKER_STATE_RUNNING, workerStateEvent -> handlerCalled.set(true)); service.start(); executor.executeScheduled(); @@ -1155,18 +1015,10 @@ @Test public void removed_onRunningHandlerNotCalled() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); final AtomicBoolean sanity = new AtomicBoolean(false); - EventHandler handler = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }; + EventHandler handler = workerStateEvent -> handlerCalled.set(true); service.addEventHandler(WorkerStateEvent.WORKER_STATE_RUNNING, handler); service.removeEventHandler(WorkerStateEvent.WORKER_STATE_RUNNING, handler); - service.addEventHandler(WorkerStateEvent.WORKER_STATE_RUNNING, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + service.addEventHandler(WorkerStateEvent.WORKER_STATE_RUNNING, workerStateEvent -> sanity.set(true)); service.start(); executor.executeScheduled(); @@ -1177,19 +1029,10 @@ @Test public void removed_onRunningFilterNotCalled() { final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean sanity = new AtomicBoolean(false); - EventHandler filter = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }; + EventHandler filter = workerStateEvent -> filterCalled.set(true); service.addEventFilter(WorkerStateEvent.WORKER_STATE_RUNNING, filter); service.removeEventFilter(WorkerStateEvent.WORKER_STATE_RUNNING, filter); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_RUNNING, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + service.addEventFilter(WorkerStateEvent.WORKER_STATE_RUNNING, workerStateEvent -> sanity.set(true)); service.start(); executor.executeScheduled(); @@ -1199,15 +1042,11 @@ @Test public void cancelCalledFromOnRunning() { final AtomicInteger cancelNotificationCount = new AtomicInteger(); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_RUNNING, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - service.cancel(); - } + service.addEventFilter(WorkerStateEvent.WORKER_STATE_RUNNING, workerStateEvent -> { + service.cancel(); }); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, new EventHandler() { - @Override public void handle(WorkerStateEvent event) { - cancelNotificationCount.incrementAndGet(); - } + service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, event -> { + cancelNotificationCount.incrementAndGet(); }); service.start(); @@ -1238,16 +1077,8 @@ @Test public void onSucceededFilterCalledBefore_onSucceeded() { final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean filterCalledFirst = new AtomicBoolean(false); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_SUCCEEDED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }); - service.setOnSucceeded(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalledFirst.set(filterCalled.get()); - } - }); + service.addEventFilter(WorkerStateEvent.WORKER_STATE_SUCCEEDED, workerStateEvent -> filterCalled.set(true)); + service.setOnSucceeded(workerStateEvent -> filterCalledFirst.set(filterCalled.get())); // Transition to Succeeded state service.start(); @@ -1259,11 +1090,7 @@ @Test public void succeededCalledAfterHandler() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.setOnSucceeded(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + service.setOnSucceeded(workerStateEvent -> handlerCalled.set(true)); // Transition to Succeeded state service.start(); @@ -1275,11 +1102,9 @@ @Test public void succeededCalledAfterHandlerEvenIfConsumed() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.setOnSucceeded(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - workerStateEvent.consume(); - } + service.setOnSucceeded(workerStateEvent -> { + handlerCalled.set(true); + workerStateEvent.consume(); }); // Transition to Succeeded state @@ -1292,12 +1117,7 @@ @Test public void onSucceededHandlerCalled() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.addEventHandler(WorkerStateEvent.WORKER_STATE_SUCCEEDED, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + service.addEventHandler(WorkerStateEvent.WORKER_STATE_SUCCEEDED, workerStateEvent -> handlerCalled.set(true)); service.start(); executor.executeScheduled(); @@ -1309,19 +1129,10 @@ @Test public void removed_onSucceededHandlerNotCalled() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); final AtomicBoolean sanity = new AtomicBoolean(false); - EventHandler handler = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }; + EventHandler handler = workerStateEvent -> handlerCalled.set(true); service.addEventHandler(WorkerStateEvent.WORKER_STATE_SUCCEEDED, handler); service.removeEventHandler(WorkerStateEvent.WORKER_STATE_SUCCEEDED, handler); - service.addEventHandler(WorkerStateEvent.WORKER_STATE_SUCCEEDED, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + service.addEventHandler(WorkerStateEvent.WORKER_STATE_SUCCEEDED, workerStateEvent -> sanity.set(true)); service.start(); executor.executeScheduled(); @@ -1333,19 +1144,10 @@ @Test public void removed_onSucceededFilterNotCalled() { final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean sanity = new AtomicBoolean(false); - EventHandler filter = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }; + EventHandler filter = workerStateEvent -> filterCalled.set(true); service.addEventFilter(WorkerStateEvent.WORKER_STATE_SUCCEEDED, filter); service.removeEventFilter(WorkerStateEvent.WORKER_STATE_SUCCEEDED, filter); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_SUCCEEDED, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + service.addEventFilter(WorkerStateEvent.WORKER_STATE_SUCCEEDED, workerStateEvent -> sanity.set(true)); service.start(); executor.executeScheduled(); @@ -1354,15 +1156,11 @@ @Test public void cancelCalledFromOnSucceeded() { final AtomicInteger cancelNotificationCount = new AtomicInteger(); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_SUCCEEDED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - service.cancel(); - } + service.addEventFilter(WorkerStateEvent.WORKER_STATE_SUCCEEDED, workerStateEvent -> { + service.cancel(); }); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, new EventHandler() { - @Override public void handle(WorkerStateEvent event) { - cancelNotificationCount.incrementAndGet(); - } + service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, event -> { + cancelNotificationCount.incrementAndGet(); }); service.start(); @@ -1394,16 +1192,8 @@ @Test public void onCancelledFilterCalledBefore_onCancelled() { final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean filterCalledFirst = new AtomicBoolean(false); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }); - service.setOnCancelled(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalledFirst.set(filterCalled.get()); - } - }); + service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, workerStateEvent -> filterCalled.set(true)); + service.setOnCancelled(workerStateEvent -> filterCalledFirst.set(filterCalled.get())); // Transition to Cancelled state service.start(); @@ -1415,12 +1205,7 @@ @Test public void cancelledCalledAfterHandler() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.setOnCancelled(new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + service.setOnCancelled(workerStateEvent -> handlerCalled.set(true)); // Transition to Cancelled state service.start(); @@ -1432,11 +1217,9 @@ @Test public void cancelledCalledAfterHandlerEvenIfConsumed() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.setOnCancelled(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - workerStateEvent.consume(); - } + service.setOnCancelled(workerStateEvent -> { + handlerCalled.set(true); + workerStateEvent.consume(); }); // Transition to Cancelled state @@ -1449,12 +1232,7 @@ @Test public void onCancelledHandlerCalled() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.addEventHandler(WorkerStateEvent.WORKER_STATE_CANCELLED, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + service.addEventHandler(WorkerStateEvent.WORKER_STATE_CANCELLED, workerStateEvent -> handlerCalled.set(true)); service.start(); executor.executeScheduled(); @@ -1466,19 +1244,10 @@ @Test public void removed_onCancelledHandlerNotCalled() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); final AtomicBoolean sanity = new AtomicBoolean(false); - EventHandler handler = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }; + EventHandler handler = workerStateEvent -> handlerCalled.set(true); service.addEventHandler(WorkerStateEvent.WORKER_STATE_CANCELLED, handler); service.removeEventHandler(WorkerStateEvent.WORKER_STATE_CANCELLED, handler); - service.addEventHandler(WorkerStateEvent.WORKER_STATE_CANCELLED, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + service.addEventHandler(WorkerStateEvent.WORKER_STATE_CANCELLED, workerStateEvent -> sanity.set(true)); service.start(); executor.executeScheduled(); @@ -1490,19 +1259,10 @@ @Test public void removed_onCancelledFilterNotCalled() { final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean sanity = new AtomicBoolean(false); - EventHandler filter = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }; + EventHandler filter = workerStateEvent -> filterCalled.set(true); service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, filter); service.removeEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, filter); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, workerStateEvent -> sanity.set(true)); service.start(); executor.executeScheduled(); @@ -1513,15 +1273,11 @@ @Test public void cancelCalledFromOnCancelled() { final AtomicInteger cancelNotificationCount = new AtomicInteger(); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - service.cancel(); - } + service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, workerStateEvent -> { + service.cancel(); }); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, new EventHandler() { - @Override public void handle(WorkerStateEvent event) { - cancelNotificationCount.incrementAndGet(); - } + service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, event -> { + cancelNotificationCount.incrementAndGet(); }); service.start(); @@ -1533,15 +1289,11 @@ @Test public void cancelCalledFromOnFailed() { final AtomicInteger cancelNotificationCount = new AtomicInteger(); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_FAILED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - service.cancel(); - } + service.addEventFilter(WorkerStateEvent.WORKER_STATE_FAILED, workerStateEvent -> { + service.cancel(); }); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, new EventHandler() { - @Override public void handle(WorkerStateEvent event) { - cancelNotificationCount.incrementAndGet(); - } + service.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, event -> { + cancelNotificationCount.incrementAndGet(); }); service.start(); @@ -1573,16 +1325,8 @@ @Test public void onFailedFilterCalledBefore_onFailed() { final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean filterCalledFirst = new AtomicBoolean(false); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_FAILED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }); - service.setOnFailed(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalledFirst.set(filterCalled.get()); - } - }); + service.addEventFilter(WorkerStateEvent.WORKER_STATE_FAILED, workerStateEvent -> filterCalled.set(true)); + service.setOnFailed(workerStateEvent -> filterCalledFirst.set(filterCalled.get())); // Transition to Succeeded state service.start(); @@ -1594,11 +1338,7 @@ @Test public void failedCalledAfterHandler() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.setOnFailed(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + service.setOnFailed(workerStateEvent -> handlerCalled.set(true)); // Transition to Succeeded state service.start(); @@ -1610,12 +1350,7 @@ @Test public void failedCalledAfterHandlerEvenIfConsumed() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.setOnFailed(new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + service.setOnFailed(workerStateEvent -> handlerCalled.set(true)); // Transition to Succeeded state service.start(); @@ -1627,12 +1362,7 @@ @Test public void onFailedHandlerCalled() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); - service.addEventHandler(WorkerStateEvent.WORKER_STATE_FAILED, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + service.addEventHandler(WorkerStateEvent.WORKER_STATE_FAILED, workerStateEvent -> handlerCalled.set(true)); service.start(); executor.executeScheduled(); @@ -1644,19 +1374,10 @@ @Test public void removed_onFailedHandlerNotCalled() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); final AtomicBoolean sanity = new AtomicBoolean(false); - EventHandler handler = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }; + EventHandler handler = workerStateEvent -> handlerCalled.set(true); service.addEventHandler(WorkerStateEvent.WORKER_STATE_FAILED, handler); service.removeEventHandler(WorkerStateEvent.WORKER_STATE_FAILED, handler); - service.addEventHandler(WorkerStateEvent.WORKER_STATE_FAILED, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + service.addEventHandler(WorkerStateEvent.WORKER_STATE_FAILED, workerStateEvent -> sanity.set(true)); service.start(); executor.executeScheduled(); @@ -1668,19 +1389,10 @@ @Test public void removed_onFailedFilterNotCalled() { final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean sanity = new AtomicBoolean(false); - EventHandler filter = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }; + EventHandler filter = workerStateEvent -> filterCalled.set(true); service.addEventFilter(WorkerStateEvent.WORKER_STATE_FAILED, filter); service.removeEventFilter(WorkerStateEvent.WORKER_STATE_FAILED, filter); - service.addEventFilter(WorkerStateEvent.WORKER_STATE_FAILED, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + service.addEventFilter(WorkerStateEvent.WORKER_STATE_FAILED, workerStateEvent -> sanity.set(true)); service.start(); executor.executeScheduled(); @@ -1698,138 +1410,107 @@ **************************************************************************/ @Test public void canCreateServiceOnRandomThread() { - RandomThread random = new RandomThread(new Runnable() { - @Override public void run() { - DoNothingService s = null; - try { - s = new DoNothingService(); - } finally { - if (s != null) s.shutdown(); - } + RandomThread random = new RandomThread(() -> { + DoNothingService s = null; + try { + s = new DoNothingService(); + } finally { + if (s != null) s.shutdown(); } }); random.test(); } @Test public void canGetReferencesToPropertiesOnRandomThread() { - RandomThread random = new RandomThread(new Runnable() { - @Override public void run() { - DoNothingService s = null; - try { - s = new DoNothingService(); - s.exceptionProperty(); - s.executorProperty(); - s.messageProperty(); - s.progressProperty(); - s.onCancelledProperty(); - s.onFailedProperty(); - s.onReadyProperty(); - s.onRunningProperty(); - s.onScheduledProperty(); - s.onSucceededProperty(); - s.runningProperty(); - s.stateProperty(); - s.titleProperty(); - s.totalWorkProperty(); - s.valueProperty(); - s.workDoneProperty(); - } finally { - if (s != null) s.shutdown(); - } + RandomThread random = new RandomThread(() -> { + DoNothingService s = null; + try { + s = new DoNothingService(); + s.exceptionProperty(); + s.executorProperty(); + s.messageProperty(); + s.progressProperty(); + s.onCancelledProperty(); + s.onFailedProperty(); + s.onReadyProperty(); + s.onRunningProperty(); + s.onScheduledProperty(); + s.onSucceededProperty(); + s.runningProperty(); + s.stateProperty(); + s.titleProperty(); + s.totalWorkProperty(); + s.valueProperty(); + s.workDoneProperty(); + } finally { + if (s != null) s.shutdown(); } }); random.test(); } @Test public void canInvokeGettersOnRandomThread() { - RandomThread random = new RandomThread(new Runnable() { - @Override public void run() { - DoNothingService s = null; - try { - s = new DoNothingService(); - s.getException(); - s.getExecutor(); - s.getMessage(); - s.getProgress(); - s.getOnCancelled(); - s.getOnFailed(); - s.getOnReady(); - s.getOnRunning(); - s.getOnScheduled(); - s.getOnSucceeded(); - s.isRunning(); - s.getState(); - s.getTitle(); - s.getTotalWork(); - s.getValue(); - s.getWorkDone(); - } finally { - if (s != null) s.shutdown(); - } + RandomThread random = new RandomThread(() -> { + DoNothingService s = null; + try { + s = new DoNothingService(); + s.getException(); + s.getExecutor(); + s.getMessage(); + s.getProgress(); + s.getOnCancelled(); + s.getOnFailed(); + s.getOnReady(); + s.getOnRunning(); + s.getOnScheduled(); + s.getOnSucceeded(); + s.isRunning(); + s.getState(); + s.getTitle(); + s.getTotalWork(); + s.getValue(); + s.getWorkDone(); + } finally { + if (s != null) s.shutdown(); } }); random.test(); } @Test public void canInvokeSettersOnRandomThread() { - RandomThread random = new RandomThread(new Runnable() { - @Override public void run() { - DoNothingService s = null; - try { - s = new DoNothingService(); - s.setEventHandler(WorkerStateEvent.ANY, new EventHandler() { - @Override - public void handle(Event event) { - } - }); - s.setOnCancelled(new EventHandler() { - @Override - public void handle(WorkerStateEvent event) { - } - }); - s.setOnFailed(new EventHandler() { - @Override - public void handle(WorkerStateEvent event) { - } - }); - s.setOnReady(new EventHandler() { - @Override - public void handle(WorkerStateEvent event) { - } - }); - s.setOnRunning(new EventHandler() { - @Override - public void handle(WorkerStateEvent event) { - } - }); - s.setOnScheduled(new EventHandler() { - @Override - public void handle(WorkerStateEvent event) { - } - }); - s.setOnSucceeded(new EventHandler() { - @Override - public void handle(WorkerStateEvent event) { - } - }); - } finally { - if (s != null) s.shutdown(); - } + RandomThread random = new RandomThread(() -> { + DoNothingService s = null; + try { + s = new DoNothingService(); + s.setEventHandler(WorkerStateEvent.ANY, event -> { + }); + s.setOnCancelled(event -> { + }); + s.setOnFailed(event -> { + }); + s.setOnReady(event -> { + }); + s.setOnRunning(event -> { + }); + s.setOnScheduled(event -> { + }); + s.setOnSucceeded(event -> { + }); + } finally { + if (s != null) s.shutdown(); } }); random.test(); } @Test public void canInvokeStartOnRandomThread() { - RandomThread random = new RandomThread(new Runnable() { - @Override public void run() { - DoNothingService s = null; - try { - s = new DoNothingService(); - s.start(); - } finally { - if (s != null) s.shutdown(); - } + RandomThread random = new RandomThread(() -> { + DoNothingService s = null; + try { + s = new DoNothingService(); + s.start(); + } finally { + if (s != null) s.shutdown(); } }); random.test(); @@ -1837,398 +1518,287 @@ @Test (expected = IllegalStateException.class) public void cannotInvokeRestartOnRandomThreadAfterStart() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.restart(); - } - }); + assertThrowsException(s -> s.restart()); } @Test (expected = IllegalStateException.class) public void cannotInvokeCancelOnRandomThreadAfterStart() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.cancel(); - } + assertThrowsException(s -> { + s.cancel(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeSettersOnRandomThreadAfterStart_1() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.setEventHandler(WorkerStateEvent.ANY, new EventHandler() { - @Override public void handle(Event event) { } - }); - } - }); + assertThrowsException(s -> s.setEventHandler(WorkerStateEvent.ANY, event -> { + })); } @Test (expected = IllegalStateException.class) public void cannotInvokeSettersOnRandomThreadAfterStart_2() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.setOnCancelled(new EventHandler() { - @Override public void handle(WorkerStateEvent event) { } - }); - } - }); + assertThrowsException(s -> s.setOnCancelled(event -> { + })); } @Test (expected = IllegalStateException.class) public void cannotInvokeSettersOnRandomThreadAfterStart_3() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.setOnFailed(new EventHandler() { - @Override public void handle(WorkerStateEvent event) { } - }); - } - }); + assertThrowsException(s -> s.setOnFailed(event -> { })); } @Test (expected = IllegalStateException.class) public void cannotInvokeSettersOnRandomThreadAfterStart_4() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.setOnReady(new EventHandler() { - @Override public void handle(WorkerStateEvent event) { } - }); - } - }); + assertThrowsException(s -> s.setOnReady(event -> { })); } @Test (expected = IllegalStateException.class) public void cannotInvokeSettersOnRandomThreadAfterStart_5() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.setOnRunning(new EventHandler() { - @Override public void handle(WorkerStateEvent event) { } - }); - } - }); + assertThrowsException(s -> s.setOnRunning(event -> { })); } @Test (expected = IllegalStateException.class) public void cannotInvokeSettersOnRandomThreadAfterStart_6() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.setOnScheduled(new EventHandler() { - @Override public void handle(WorkerStateEvent event) { } - }); - } - }); + assertThrowsException(s -> s.setOnScheduled(event -> { + })); } @Test (expected = IllegalStateException.class) public void cannotInvokeSettersOnRandomThreadAfterStart_7() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.setOnSucceeded(new EventHandler() { - @Override public void handle(WorkerStateEvent event) { } - }); - } - }); + assertThrowsException(s -> s.setOnSucceeded(event -> { })); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_1() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getException(); - } + assertThrowsException(s -> { + s.getException(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_2() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getExecutor(); - } + assertThrowsException(s -> { + s.getExecutor(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_3() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getMessage(); - } + assertThrowsException(s -> { + s.getMessage(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_4() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getProgress(); - } + assertThrowsException(s -> { + s.getProgress(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_5() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getOnCancelled(); - } + assertThrowsException(s -> { + s.getOnCancelled(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_6() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getOnFailed(); - } + assertThrowsException(s -> { + s.getOnFailed(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_7() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getOnReady(); - } + assertThrowsException(s -> { + s.getOnReady(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_8() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getOnRunning(); - } + assertThrowsException(s -> { + s.getOnRunning(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_9() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getOnScheduled(); - } + assertThrowsException(s -> { + s.getOnScheduled(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_10() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getOnSucceeded(); - } + assertThrowsException(s -> { + s.getOnSucceeded(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_11() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.isRunning(); - } + assertThrowsException(s -> { + s.isRunning(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_12() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getState(); - } + assertThrowsException(s -> { + s.getState(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_13() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getTitle(); - } + assertThrowsException(s -> { + s.getTitle(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_14() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getTotalWork(); - } + assertThrowsException(s -> { + s.getTotalWork(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_15() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getValue(); - } + assertThrowsException(s -> { + s.getValue(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokeGettersOnRandomThreadAfterStart_16() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.getValue(); - } + assertThrowsException(s -> { + s.getValue(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_1() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.exceptionProperty(); - } + assertThrowsException(s -> { + s.exceptionProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_2() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.executorProperty(); - } + assertThrowsException(s -> { + s.executorProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_3() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.messageProperty(); - } + assertThrowsException(s -> { + s.messageProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_4() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.progressProperty(); - } + assertThrowsException(s -> { + s.progressProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_5() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.onCancelledProperty(); - } + assertThrowsException(s -> { + s.onCancelledProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_6() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.onFailedProperty(); - } + assertThrowsException(s -> { + s.onFailedProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_7() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.onReadyProperty(); - } + assertThrowsException(s -> { + s.onReadyProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_8() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.onRunningProperty(); - } + assertThrowsException(s -> { + s.onRunningProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_9() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.onScheduledProperty(); - } + assertThrowsException(s -> { + s.onScheduledProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_10() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.onSucceededProperty(); - } + assertThrowsException(s -> { + s.onSucceededProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_11() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.runningProperty(); - } + assertThrowsException(s -> { + s.runningProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_12() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.stateProperty(); - } + assertThrowsException(s -> { + s.stateProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_13() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.titleProperty(); - } + assertThrowsException(s -> { + s.titleProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_14() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.totalWorkProperty(); - } + assertThrowsException(s -> { + s.totalWorkProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_15() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.valueProperty(); - } + assertThrowsException(s -> { + s.valueProperty(); }); } @Test (expected = IllegalStateException.class) public void cannotInvokePropertyGettersOnRandomThreadAfterStart_16() throws Throwable { - assertThrowsException(new ServiceTestExecution() { - @Override public void test(DoNothingService s) { - s.workDoneProperty(); - } + assertThrowsException(s -> { + s.workDoneProperty(); }); } private void assertThrowsException(final ServiceTestExecution c) throws Throwable { - RandomThread random = new RandomThread(new Runnable() { - @Override public void run() { - DoNothingService s = null; - try { - s = new DoNothingService(); - s.start(); - c.test(s); - } finally { - if (s != null) s.shutdown(); - } + RandomThread random = new RandomThread(() -> { + DoNothingService s = null; + try { + s = new DoNothingService(); + s.start(); + c.test(s); + } finally { + if (s != null) s.shutdown(); } }); @@ -2290,11 +1860,9 @@ private volatile boolean shutdown = false; public DoNothingService() { - setExecutor(new Executor() { - @Override public void execute(Runnable command) { - Thread backgroundThread = new Thread(command); - backgroundThread.start(); - } + setExecutor(command -> { + Thread backgroundThread = new Thread(command); + backgroundThread.start(); }); } @@ -2357,11 +1925,7 @@ @Override protected Service createService() { MythicalService svc = new MythicalService(); - svc.setHandler(new EventHandler() { - @Override public void handle(MythicalEvent mythicalEvent) { - result.set(true); - } - }); + svc.setHandler(mythicalEvent -> result.set(true)); svc.fireEvent(new MythicalEvent()); return svc; } diff --git a/modules/graphics/src/test/java/javafx/concurrent/ServiceTest.java b/modules/graphics/src/test/java/javafx/concurrent/ServiceTest.java --- a/modules/graphics/src/test/java/javafx/concurrent/ServiceTest.java +++ b/modules/graphics/src/test/java/javafx/concurrent/ServiceTest.java @@ -77,9 +77,7 @@ * then set on the service */ @Test public void executorCanBeSet() { - final Executor e = new Executor() { - @Override public void execute(Runnable command) { } - }; + final Executor e = command -> { }; service.setExecutor(e); assertSame(e, service.getExecutor()); assertSame(e, service.executorProperty().get()); @@ -89,9 +87,7 @@ * Tests that you can bind the executor property of a Service */ @Test public void executorCanBeBound() { - final Executor e = new Executor() { - @Override public void execute(Runnable command) { } - }; + final Executor e = command -> { }; ObjectProperty other = new SimpleObjectProperty(e); service.executorProperty().bind(other); assertSame(e, service.getExecutor()); @@ -107,11 +103,7 @@ */ @Test public void executorIsUsed() { final AtomicBoolean results = new AtomicBoolean(false); - final Executor e = new Executor() { - @Override public void execute(Runnable command) { - results.set(true); - } - }; + final Executor e = command -> results.set(true); service.setExecutor(e); service.start(); assertTrue(results.get()); diff --git a/modules/graphics/src/test/java/javafx/concurrent/ServiceTestBase.java b/modules/graphics/src/test/java/javafx/concurrent/ServiceTestBase.java --- a/modules/graphics/src/test/java/javafx/concurrent/ServiceTestBase.java +++ b/modules/graphics/src/test/java/javafx/concurrent/ServiceTestBase.java @@ -42,23 +42,21 @@ protected abstract TestServiceFactory setupServiceFactory(); protected Executor createExecutor() { - return new Executor() { - @Override public void execute(final Runnable command) { - if (command == null) Thread.dumpStack(); - Thread th = new Thread() { - @Override public void run() { - try { - command.run(); - } catch (Exception e) { - e.printStackTrace(); - } finally { - eventQueue.add(new Sentinel()); - } + return command -> { + if (command == null) Thread.dumpStack(); + Thread th = new Thread() { + @Override public void run() { + try { + command.run(); + } catch (Exception e) { + e.printStackTrace(); + } finally { + eventQueue.add(new Sentinel()); } - }; - th.setDaemon(true); - th.start(); - } + } + }; + th.setDaemon(true); + th.start(); }; } diff --git a/modules/graphics/src/test/java/javafx/concurrent/ServiceWithSecurityManagerTest.java b/modules/graphics/src/test/java/javafx/concurrent/ServiceWithSecurityManagerTest.java --- a/modules/graphics/src/test/java/javafx/concurrent/ServiceWithSecurityManagerTest.java +++ b/modules/graphics/src/test/java/javafx/concurrent/ServiceWithSecurityManagerTest.java @@ -62,13 +62,11 @@ SecurityManager original = System.getSecurityManager(); try { mainThreadGroup = new ThreadGroup(Thread.currentThread().getThreadGroup(), "FX Test Thread Group"); - Thread thread = new Thread(mainThreadGroup, new Runnable() { - @Override public void run() { - try { - s.evaluate(); - } catch (Throwable t) { - throwable = t; - } + Thread thread = new Thread(mainThreadGroup, () -> { + try { + s.evaluate(); + } catch (Throwable t) { + throwable = t; } }); diff --git a/modules/graphics/src/test/java/javafx/concurrent/TaskEventTest.java b/modules/graphics/src/test/java/javafx/concurrent/TaskEventTest.java --- a/modules/graphics/src/test/java/javafx/concurrent/TaskEventTest.java +++ b/modules/graphics/src/test/java/javafx/concurrent/TaskEventTest.java @@ -69,11 +69,7 @@ @Test public void onScheduledCalledWhenSetViaProperty() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); SimpleTask task = new SimpleTask(); - task.onScheduledProperty().set(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + task.onScheduledProperty().set(workerStateEvent -> handlerCalled.set(true)); task.simulateSchedule(); // Events should have happened @@ -84,18 +80,8 @@ SimpleTask task = new SimpleTask(); final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean filterCalledFirst = new AtomicBoolean(false); - task.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }); - task.setOnScheduled(new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - filterCalledFirst.set(filterCalled.get()); - } - }); + task.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, workerStateEvent -> filterCalled.set(true)); + task.setOnScheduled(workerStateEvent -> filterCalledFirst.set(filterCalled.get())); // Transition to Scheduled state task.simulateSchedule(); @@ -111,11 +97,7 @@ scheduledCalledLast.set(handlerCalled.get()); } }; - task.setOnScheduled(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + task.setOnScheduled(workerStateEvent -> handlerCalled.set(true)); // Transition to Scheduled state task.simulateSchedule(); @@ -130,11 +112,7 @@ scheduledCalled.set(true); } }; - task.setOnScheduled(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - workerStateEvent.consume(); - } - }); + task.setOnScheduled(workerStateEvent -> workerStateEvent.consume()); // Transition to Scheduled state task.simulateSchedule(); @@ -145,12 +123,7 @@ @Test public void onScheduledHandlerCalled() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); SimpleTask task = new SimpleTask(); - task.addEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + task.addEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, workerStateEvent -> handlerCalled.set(true)); task.simulateSchedule(); // Events should have happened @@ -161,18 +134,10 @@ final AtomicBoolean handlerCalled = new AtomicBoolean(false); final AtomicBoolean sanity = new AtomicBoolean(false); SimpleTask task = new SimpleTask(); - EventHandler handler = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }; + EventHandler handler = workerStateEvent -> handlerCalled.set(true); task.addEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, handler); task.removeEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, handler); - task.addEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + task.addEventHandler(WorkerStateEvent.WORKER_STATE_SCHEDULED, workerStateEvent -> sanity.set(true)); task.simulateSchedule(); assertTrue(sanity.get()); @@ -183,18 +148,10 @@ final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean sanity = new AtomicBoolean(false); SimpleTask task = new SimpleTask(); - EventHandler filter = new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }; + EventHandler filter = workerStateEvent -> filterCalled.set(true); task.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, filter); task.removeEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, filter); - task.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - sanity.set(true); - } - }); + task.addEventFilter(WorkerStateEvent.WORKER_STATE_SCHEDULED, workerStateEvent -> sanity.set(true)); task.simulateSchedule(); assertTrue(sanity.get()); @@ -226,11 +183,7 @@ @Test public void onRunningCalledWhenSetViaProperty() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); SimpleTask task = new SimpleTask(); - task.onRunningProperty().set(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + task.onRunningProperty().set(workerStateEvent -> handlerCalled.set(true)); task.run(); // Events should have happened @@ -241,16 +194,8 @@ SimpleTask task = new SimpleTask(); final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean filterCalledFirst = new AtomicBoolean(false); - task.addEventFilter(WorkerStateEvent.WORKER_STATE_RUNNING, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }); - task.setOnRunning(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalledFirst.set(filterCalled.get()); - } - }); + task.addEventFilter(WorkerStateEvent.WORKER_STATE_RUNNING, workerStateEvent -> filterCalled.set(true)); + task.setOnRunning(workerStateEvent -> filterCalledFirst.set(filterCalled.get())); // Transition to Running state task.run(); @@ -266,11 +211,7 @@ runningCalledLast.set(handlerCalled.get()); } }; - task.setOnRunning(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + task.setOnRunning(workerStateEvent -> handlerCalled.set(true)); task.run(); // Events should have happened @@ -284,11 +225,7 @@ runningCalled.set(true); } }; - task.setOnRunning(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - workerStateEvent.consume(); - } - }); + task.setOnRunning(workerStateEvent -> workerStateEvent.consume()); task.run(); // Events should have happened @@ -320,11 +257,7 @@ @Test public void onSucceededCalledWhenSetViaProperty() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); SimpleTask task = new SimpleTask(); - task.onSucceededProperty().set(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + task.onSucceededProperty().set(workerStateEvent -> handlerCalled.set(true)); task.run(); // Events should have happened @@ -335,16 +268,8 @@ SimpleTask task = new SimpleTask(); final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean filterCalledFirst = new AtomicBoolean(false); - task.addEventFilter(WorkerStateEvent.WORKER_STATE_SUCCEEDED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }); - task.setOnSucceeded(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalledFirst.set(filterCalled.get()); - } - }); + task.addEventFilter(WorkerStateEvent.WORKER_STATE_SUCCEEDED, workerStateEvent -> filterCalled.set(true)); + task.setOnSucceeded(workerStateEvent -> filterCalledFirst.set(filterCalled.get())); task.run(); // Events should have happened @@ -359,11 +284,7 @@ succeededCalledLast.set(handlerCalled.get()); } }; - task.setOnSucceeded(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + task.setOnSucceeded(workerStateEvent -> handlerCalled.set(true)); task.run(); // Events should have happened @@ -377,11 +298,7 @@ succeededCalled.set(true); } }; - task.setOnSucceeded(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - workerStateEvent.consume(); - } - }); + task.setOnSucceeded(workerStateEvent -> workerStateEvent.consume()); task.run(); // Events should have happened @@ -413,11 +330,7 @@ @Test public void onCancelledCalledWhenSetViaProperty() throws Exception { final AtomicBoolean handlerCalled = new AtomicBoolean(false); InfiniteTask task = new InfiniteTask(); - task.onCancelledProperty().set(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + task.onCancelledProperty().set(workerStateEvent -> handlerCalled.set(true)); Thread th = new Thread(task); th.start(); @@ -431,16 +344,8 @@ InfiniteTask task = new InfiniteTask(); final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean filterCalledFirst = new AtomicBoolean(false); - task.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }); - task.setOnCancelled(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalledFirst.set(filterCalled.get()); - } - }); + task.addEventFilter(WorkerStateEvent.WORKER_STATE_CANCELLED, workerStateEvent -> filterCalled.set(true)); + task.setOnCancelled(workerStateEvent -> filterCalledFirst.set(filterCalled.get())); Thread th = new Thread(task); th.start(); @@ -458,12 +363,7 @@ cancelledCalledLast.set(handlerCalled.get()); } }; - task.setOnCancelled(new EventHandler() { - @Override - public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + task.setOnCancelled(workerStateEvent -> handlerCalled.set(true)); Thread th = new Thread(task); th.start(); @@ -480,11 +380,7 @@ cancelledCalled.set(true); } }; - task.setOnCancelled(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - workerStateEvent.consume(); - } - }); + task.setOnCancelled(workerStateEvent -> workerStateEvent.consume()); Thread th = new Thread(task); th.start(); @@ -519,11 +415,7 @@ @Test public void onFailedCalledWhenSetViaProperty() { final AtomicBoolean handlerCalled = new AtomicBoolean(false); Task task = new EpicFailTask(); - task.onFailedProperty().set(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + task.onFailedProperty().set(workerStateEvent -> handlerCalled.set(true)); task.run(); // Events should have happened @@ -534,16 +426,8 @@ Task task = new EpicFailTask(); final AtomicBoolean filterCalled = new AtomicBoolean(false); final AtomicBoolean filterCalledFirst = new AtomicBoolean(false); - task.addEventFilter(WorkerStateEvent.WORKER_STATE_FAILED, new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalled.set(true); - } - }); - task.setOnFailed(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - filterCalledFirst.set(filterCalled.get()); - } - }); + task.addEventFilter(WorkerStateEvent.WORKER_STATE_FAILED, workerStateEvent -> filterCalled.set(true)); + task.setOnFailed(workerStateEvent -> filterCalledFirst.set(filterCalled.get())); task.run(); // Events should have happened @@ -558,11 +442,7 @@ failedCalledLast.set(handlerCalled.get()); } }; - task.setOnFailed(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - handlerCalled.set(true); - } - }); + task.setOnFailed(workerStateEvent -> handlerCalled.set(true)); task.run(); // Events should have happened @@ -576,11 +456,7 @@ failedCalled.set(true); } }; - task.setOnFailed(new EventHandler() { - @Override public void handle(WorkerStateEvent workerStateEvent) { - workerStateEvent.consume(); - } - }); + task.setOnFailed(workerStateEvent -> workerStateEvent.consume()); task.run(); // Events should have happened @@ -597,11 +473,7 @@ @Test public void eventFiredOnSubclassWorks() { final AtomicBoolean result = new AtomicBoolean(false); MythicalTask task = new MythicalTask(); - task.setHandler(new EventHandler() { - @Override public void handle(MythicalEvent mythicalEvent) { - result.set(true); - } - }); + task.setHandler(mythicalEvent -> result.set(true)); task.fireEvent(new MythicalEvent()); assertTrue(result.get()); } diff --git a/modules/graphics/src/test/java/javafx/concurrent/TaskSimpleTest.java b/modules/graphics/src/test/java/javafx/concurrent/TaskSimpleTest.java --- a/modules/graphics/src/test/java/javafx/concurrent/TaskSimpleTest.java +++ b/modules/graphics/src/test/java/javafx/concurrent/TaskSimpleTest.java @@ -48,15 +48,12 @@ task = new SimpleTask(); // Checks that the running property is always correct. - task.runningProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue o, Boolean oldValue, Boolean newValue) { - Worker.State s = task.getState(); - if (newValue) { - assertTrue(s == Worker.State.SCHEDULED || s == Worker.State.RUNNING); - } else { - assertTrue(s != Worker.State.SCHEDULED && s != Worker.State.RUNNING); - } + task.runningProperty().addListener((o, oldValue, newValue) -> { + Worker.State s = task.getState(); + if (newValue) { + assertTrue(s == Worker.State.SCHEDULED || s == Worker.State.RUNNING); + } else { + assertTrue(s != Worker.State.SCHEDULED && s != Worker.State.RUNNING); } }); } @@ -119,11 +116,8 @@ @Test public void afterRunningStatesShouldHaveBeen_SCHEDULED_RUNNING_SUCCEEDED() { final List states = new ArrayList(); - task.stateProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, Worker.State oldValue, Worker.State newValue) { - states.add(newValue); - } + task.stateProperty().addListener((observable, oldValue, newValue) -> { + states.add(newValue); }); task.run(); diff --git a/modules/graphics/src/test/java/javafx/scene/EventAnyTest.java b/modules/graphics/src/test/java/javafx/scene/EventAnyTest.java --- a/modules/graphics/src/test/java/javafx/scene/EventAnyTest.java +++ b/modules/graphics/src/test/java/javafx/scene/EventAnyTest.java @@ -120,10 +120,8 @@ Node n = new Rectangle(); delivered = false; - n.addEventHandler(type, new EventHandler() { - @Override public void handle(Event event) { - delivered = true; - } + n.addEventHandler(type, event1 -> { + delivered = true; }); Event.fireEvent(n, event); diff --git a/modules/graphics/src/test/java/javafx/scene/FocusTest.java b/modules/graphics/src/test/java/javafx/scene/FocusTest.java --- a/modules/graphics/src/test/java/javafx/scene/FocusTest.java +++ b/modules/graphics/src/test/java/javafx/scene/FocusTest.java @@ -673,32 +673,19 @@ final Node n2 = n(); scene.setRoot(new Group(n1, n2)); - n1.focusedProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue ov, - Boolean lostFocus, Boolean getFocus) { - if (lostFocus) { - n1.requestFocus(); - } + n1.focusedProperty().addListener((ov, lostFocus, getFocus) -> { + if (lostFocus) { + n1.requestFocus(); } }); - n2.focusedProperty().addListener(new InvalidationListener() { - @Override - public void invalidated(Observable o) { - // n2 can be invalidated, but should not have focus - assertTrue(n1.isFocused()); - assertFalse(n2.isFocused()); - } + n2.focusedProperty().addListener(o -> { + // n2 can be invalidated, but should not have focus + assertTrue(n1.isFocused()); + assertFalse(n2.isFocused()); }); - n2.focusedProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue ov, - Boolean lostFocus, Boolean getFocus) { - fail("n2 should never get focus"); - } - }); + n2.focusedProperty().addListener((ov, lostFocus, getFocus) -> fail("n2 should never get focus")); stage.show(); n1.requestFocus(); @@ -724,12 +711,11 @@ actionTaken = false; ((StubScene) scene.impl_getPeer()).setInputMethodCompositionFinishDelegate( - new Runnable() { - @Override public void run() { - assertSame(n1, scene.getFocusOwner()); - actionTaken = true; - } - }); + () -> { + assertSame(n1, scene.getFocusOwner()); + actionTaken = true; + } + ); n2.requestFocus(); diff --git a/modules/graphics/src/test/java/javafx/scene/ImageCursorTest.java b/modules/graphics/src/test/java/javafx/scene/ImageCursorTest.java --- a/modules/graphics/src/test/java/javafx/scene/ImageCursorTest.java +++ b/modules/graphics/src/test/java/javafx/scene/ImageCursorTest.java @@ -268,12 +268,7 @@ final ImageCursor testCursor = new ImageCursor(testImage, 16, 16); final InvalidationListener imageCursorChecker = - new InvalidationListener() { - @Override - public void invalidated(final Observable observable) { - assertCursorEquals(testCursor, testImage, 16, 16); - } - }; + observable -> assertCursorEquals(testCursor, testImage, 16, 16); testCursor.hotspotXProperty().addListener(imageCursorChecker); testCursor.hotspotYProperty().addListener(imageCursorChecker); diff --git a/modules/graphics/src/test/java/javafx/scene/Mouse3DTest.java b/modules/graphics/src/test/java/javafx/scene/Mouse3DTest.java --- a/modules/graphics/src/test/java/javafx/scene/Mouse3DTest.java +++ b/modules/graphics/src/test/java/javafx/scene/Mouse3DTest.java @@ -2274,11 +2274,7 @@ MouseEventGenerator g = new MouseEventGenerator(); final Box b1 = box().handleFullPDR(MouseDragEvent.MOUSE_DRAG_EXITED, smde); b1.setTranslateX(55); - b1.setOnDragDetected(new EventHandler() { - @Override public void handle(MouseEvent event) { - b1.startFullDrag(); - } - }); + b1.setOnDragDetected(event -> b1.startFullDrag()); Box b2 = box().handleFullPDR(MouseDragEvent.MOUSE_DRAG_ENTERED, tmde) .handleFullPDR(MouseDragEvent.MOUSE_DRAG_OVER, tmde2); @@ -2391,10 +2387,8 @@ stage.setScene(scene); stage.show(); - b.setOnMouseMoved(new EventHandler() { - @Override public void handle(MouseEvent event) { - me.event = event; - } + b.setOnMouseMoved(event -> { + me.event = event; }); me.event = null; @@ -2573,10 +2567,8 @@ private static void doHandleMove(Node node, final EventHolder holder) { holder.event = null; - node.setOnMouseMoved(new EventHandler() { - @Override public void handle(MouseEvent event) { - holder.event = event; - } + node.setOnMouseMoved(event -> { + holder.event = event; }); } @@ -2592,10 +2584,8 @@ public TestScene handleMove(final EventHolder holder) { holder.event = null; - setOnMouseMoved(new EventHandler() { - @Override public void handle(MouseEvent event) { - holder.event = event; - } + setOnMouseMoved(event -> { + holder.event = event; }); return this; } @@ -2650,10 +2640,8 @@ public TestBox handleDrag(final EventHolder holder) { holder.event = null; - setOnMouseDragged(new EventHandler() { - @Override public void handle(MouseEvent event) { - holder.event = event; - } + setOnMouseDragged(event -> { + holder.event = event; }); return this; } @@ -2661,10 +2649,8 @@ public TestBox handle(final EventType type, final EventHolder holder) { holder.event = null; - addEventHandler(type, new EventHandler() { - @Override public void handle(MouseEvent event) { - holder.event = event; - } + addEventHandler(type, event -> { + holder.event = event; }); return this; } @@ -2672,10 +2658,8 @@ public TestBox handleFullPDR(final EventType type, final EventHolder holder) { holder.event = null; - addEventHandler(type, new EventHandler() { - @Override public void handle(MouseDragEvent event) { - holder.event = event; - } + addEventHandler(type, event -> { + holder.event = event; }); return this; } diff --git a/modules/graphics/src/test/java/javafx/scene/MouseTest.java b/modules/graphics/src/test/java/javafx/scene/MouseTest.java --- a/modules/graphics/src/test/java/javafx/scene/MouseTest.java +++ b/modules/graphics/src/test/java/javafx/scene/MouseTest.java @@ -32,6 +32,7 @@ import javafx.scene.shape.Rectangle; import javafx.stage.Stage; +import org.junit.Assert; import org.junit.Test; import com.sun.javafx.pgstub.StubScene; @@ -89,18 +90,12 @@ public void ImpossibleToComputeCoordsShouldResultInNaNs() { final SimpleTestScene scene = new SimpleTestScene(); - scene.smallSquareTracker.node.setOnMouseMoved(new EventHandler() { - @Override public void handle(MouseEvent event) { - scene.smallSquareTracker.node.setScaleX(0); - } - }); + scene.smallSquareTracker.node.setOnMouseMoved(event -> scene.smallSquareTracker.node.setScaleX(0)); - scene.smallSquareTracker.node.setOnMouseExited(new EventHandler() { - @Override public void handle(MouseEvent event) { - assertTrue(Double.isNaN(event.getX())); - assertTrue(Double.isNaN(event.getY())); - assertTrue(Double.isNaN(event.getZ())); - } + scene.smallSquareTracker.node.setOnMouseExited(event -> { + assertTrue(Double.isNaN(event.getX())); + assertTrue(Double.isNaN(event.getY())); + assertTrue(Double.isNaN(event.getZ())); }); scene.processEvent(MouseEventGenerator.generateMouseEvent( @@ -995,15 +990,13 @@ scene.smallSquareTracker.clear(); scene.smallSquareTracker.node.addEventHandler(MouseEvent.MOUSE_RELEASED, - new EventHandler() { - - @Override public void handle(MouseEvent event) { - assertEquals(Double.NaN, event.getX(), 0.0001); - assertEquals(Double.NaN, event.getY(), 0.0001); - assertEquals(251.0, event.getSceneX(), 0.0001); - assertEquals(251.0, event.getSceneY(), 0.0001); - } - }); + event -> { + Assert.assertEquals(Double.NaN, event.getX(), 0.0001); + Assert.assertEquals(Double.NaN, event.getY(), 0.0001); + Assert.assertEquals(251.0, event.getSceneX(), 0.0001); + Assert.assertEquals(251.0, event.getSceneY(), 0.0001); + } + ); ((Rectangle) scene.smallSquareTracker.node).setScaleX(0); @@ -1088,13 +1081,12 @@ final TestSceneWithSubScenes s = new TestSceneWithSubScenes(); s.parent1.addEventHandler(MouseEvent.MOUSE_ENTERED_TARGET, - new EventHandler() { - @Override public void handle(MouseEvent event) { - if (event.getTarget() == s.innerRect1) { - s.called = true; - } + event -> { + if (event.getTarget() == s.innerRect1) { + s.called = true; } - }); + } + ); s.processEvent(MouseEvent.MOUSE_MOVED, 130, 30); s.assertCalled(); @@ -1197,11 +1189,7 @@ public void fullDragShouldDeliverToOtherSubScene() { final TestSceneWithSubScenes s = new TestSceneWithSubScenes(); - s.innerRect1.setOnDragDetected(new EventHandler() { - @Override public void handle(MouseEvent event) { - s.innerRect1.startFullDrag(); - } - }); + s.innerRect1.setOnDragDetected(event -> s.innerRect1.startFullDrag()); s.innerRect2.setOnMouseDragOver(s.handler(s.innerRect2, 10, 10)); s.processEvent(MouseEvent.MOUSE_MOVED, 130, 30); @@ -1217,11 +1205,7 @@ public void fullDragEnterShouldDeliverToOtherSubScene() { final TestSceneWithSubScenes s = new TestSceneWithSubScenes(); - s.innerRect1.setOnDragDetected(new EventHandler() { - @Override public void handle(MouseEvent event) { - s.innerRect1.startFullDrag(); - } - }); + s.innerRect1.setOnDragDetected(event -> s.innerRect1.startFullDrag()); s.innerRect2.setOnMouseDragEntered(s.handler(s.innerRect2, 10, 10)); s.processEvent(MouseEvent.MOUSE_MOVED, 130, 30); @@ -1236,11 +1220,7 @@ public void fullDragEnterShouldDeliverToOtherSubScenesParent() { final TestSceneWithSubScenes s = new TestSceneWithSubScenes(); - s.innerRect1.setOnDragDetected(new EventHandler() { - @Override public void handle(MouseEvent event) { - s.innerRect1.startFullDrag(); - } - }); + s.innerRect1.setOnDragDetected(event -> s.innerRect1.startFullDrag()); s.parent2.setOnMouseDragEntered(s.handler(s.parent2, 130, 20)); s.processEvent(MouseEvent.MOUSE_MOVED, 130, 30); @@ -1307,12 +1287,10 @@ s.subScene1.setTranslateZ(5); s.innerRect1.setTranslateZ(10); - s.parent1.setOnMouseMoved(new EventHandler() { - @Override public void handle(MouseEvent event) { - assertEquals(5, event.getZ(), 0.00001); - assertSame(s.innerRect1, event.getTarget()); - s.called = true; - } + s.parent1.setOnMouseMoved(event -> { + Assert.assertEquals(5, event.getZ(), 0.00001); + assertSame(s.innerRect1, event.getTarget()); + s.called = true; }); s.processEvent(MouseEvent.MOUSE_MOVED, 130, 30); @@ -1349,19 +1327,17 @@ ((Group) s.subScene1.getRoot()).getChildren().add(s.subScene1.getCamera()); s.subScene1.getCamera().setTranslateZ(-3.0); - s.innerRect1.setOnMouseExited(new EventHandler() { - @Override public void handle(MouseEvent event) { - assertSame(s.innerRect2, event.getPickResult().getIntersectedNode()); - assertSame(s.innerRect1, event.getTarget()); - assertEquals(16.58, event.getPickResult().getIntersectedPoint().getX(), 0.1); - assertEquals(7.33, event.getPickResult().getIntersectedPoint().getY(), 0.1); - assertEquals(0.0, event.getPickResult().getIntersectedPoint().getZ(), 0.0001); - assertEquals(295.81, event.getX(), 0.1); - assertEquals(57.64, event.getY(), 0.1); - assertEquals(-3.0, event.getZ(), 0.1); + s.innerRect1.setOnMouseExited(event -> { + assertSame(s.innerRect2, event.getPickResult().getIntersectedNode()); + assertSame(s.innerRect1, event.getTarget()); + Assert.assertEquals(16.58, event.getPickResult().getIntersectedPoint().getX(), 0.1); + Assert.assertEquals(7.33, event.getPickResult().getIntersectedPoint().getY(), 0.1); + Assert.assertEquals(0.0, event.getPickResult().getIntersectedPoint().getZ(), 0.0001); + Assert.assertEquals(295.81, event.getX(), 0.1); + Assert.assertEquals(57.64, event.getY(), 0.1); + Assert.assertEquals(-3.0, event.getZ(), 0.1); - s.called = true; - } + s.called = true; }); s.processEvent(MouseEvent.MOUSE_MOVED, 130, 30); @@ -1386,19 +1362,17 @@ s.innerRect2.setRotationAxis(Rotate.Y_AXIS); s.innerRect2.setRotate(45); - s.innerRect1.setOnMouseExited(new EventHandler() { - @Override public void handle(MouseEvent event) { - assertSame(s.innerRect2, event.getPickResult().getIntersectedNode()); - assertSame(s.innerRect1, event.getTarget()); - assertEquals(14.07, event.getPickResult().getIntersectedPoint().getX(), 0.1); - assertEquals(5.97, event.getPickResult().getIntersectedPoint().getY(), 0.1); - assertEquals(0.0, event.getPickResult().getIntersectedPoint().getZ(), 0.0001); - assertEquals(216.49, event.getX(), 0.1); - assertEquals(57.64, event.getY(), 0.1); - assertEquals(-191.49, event.getZ(), 0.1); + s.innerRect1.setOnMouseExited(event -> { + assertSame(s.innerRect2, event.getPickResult().getIntersectedNode()); + assertSame(s.innerRect1, event.getTarget()); + Assert.assertEquals(14.07, event.getPickResult().getIntersectedPoint().getX(), 0.1); + Assert.assertEquals(5.97, event.getPickResult().getIntersectedPoint().getY(), 0.1); + Assert.assertEquals(0.0, event.getPickResult().getIntersectedPoint().getZ(), 0.0001); + Assert.assertEquals(216.49, event.getX(), 0.1); + Assert.assertEquals(57.64, event.getY(), 0.1); + Assert.assertEquals(-191.49, event.getZ(), 0.1); - s.called = true; - } + s.called = true; }); s.processEvent(MouseEvent.MOUSE_MOVED, 130, 30); @@ -1413,20 +1387,14 @@ s.parent2.setTranslateZ(10); s.innerRect2.setTranslateZ(10); - s.innerRect1.setOnMouseMoved(new EventHandler() { - @Override public void handle(MouseEvent event) { - s.innerRect1.setScaleX(0.0); - } - }); + s.innerRect1.setOnMouseMoved(event -> s.innerRect1.setScaleX(0.0)); - s.innerRect1.setOnMouseExited(new EventHandler() { - @Override public void handle(MouseEvent event) { - assertSame(s.innerRect1, event.getTarget()); - assertTrue(Double.isNaN(event.getX())); - assertTrue(Double.isNaN(event.getY())); - assertTrue(Double.isNaN(event.getZ())); - s.called = true; - } + s.innerRect1.setOnMouseExited(event -> { + assertSame(s.innerRect1, event.getTarget()); + assertTrue(Double.isNaN(event.getX())); + assertTrue(Double.isNaN(event.getY())); + assertTrue(Double.isNaN(event.getZ())); + s.called = true; }); s.processEvent(MouseEvent.MOUSE_MOVED, 130, 30); @@ -1441,21 +1409,17 @@ s.parent2.setTranslateZ(10); s.innerRect2.setTranslateZ(10); - s.innerRect1.setOnMouseMoved(new EventHandler() { - @Override public void handle(MouseEvent event) { - s.subScene1.setRotationAxis(Rotate.Y_AXIS); - s.subScene1.setRotate(90); - } + s.innerRect1.setOnMouseMoved(event -> { + s.subScene1.setRotationAxis(Rotate.Y_AXIS); + s.subScene1.setRotate(90); }); - s.innerRect1.setOnMouseExited(new EventHandler() { - @Override public void handle(MouseEvent event) { - assertSame(s.innerRect1, event.getTarget()); - assertTrue(Double.isNaN(event.getX())); - assertTrue(Double.isNaN(event.getY())); - assertTrue(Double.isNaN(event.getZ())); - s.called = true; - } + s.innerRect1.setOnMouseExited(event -> { + assertSame(s.innerRect1, event.getTarget()); + assertTrue(Double.isNaN(event.getX())); + assertTrue(Double.isNaN(event.getY())); + assertTrue(Double.isNaN(event.getZ())); + s.called = true; }); s.processEvent(MouseEvent.MOUSE_MOVED, 130, 30); @@ -1467,11 +1431,8 @@ public void mouseExitedShouldBeGeneratedBeforeNodeRemoval() { final SimpleTestScene s = new SimpleTestScene(); s.smallSquareTracker.node.addEventHandler(MouseEvent.MOUSE_EXITED, - new EventHandler() { - @Override public void handle(MouseEvent event) { - assertNotNull(s.smallSquareTracker.node.getScene()); - } - }); + event -> assertNotNull(s.smallSquareTracker.node.getScene()) + ); s.processEvent(MouseEventGenerator.generateMouseEvent( MouseEvent.MOUSE_MOVED, 250, 250)); @@ -1538,21 +1499,9 @@ public void testMouseEventCanEditCursor() { final SimpleTestScene s = new SimpleTestScene(); - s.smallSquare.setOnMousePressed(new EventHandler() { - - @Override - public void handle(MouseEvent event) { - s.smallSquare.setCursor(Cursor.CROSSHAIR); - } - }); + s.smallSquare.setOnMousePressed(event -> s.smallSquare.setCursor(Cursor.CROSSHAIR)); - s.smallSquare.setOnMouseReleased(new EventHandler() { - - @Override - public void handle(MouseEvent event) { - s.smallSquare.setCursor(Cursor.WAIT); - } - }); + s.smallSquare.setOnMouseReleased(event -> s.smallSquare.setCursor(Cursor.WAIT)); s.processEvent(MouseEventGenerator.generateMouseEvent(MouseEvent.MOUSE_MOVED, 250, 250)); assertSame(Cursor.HAND.getCurrentFrame(), s.getCursorFrame()); @@ -1561,13 +1510,7 @@ s.processEvent(MouseEventGenerator.generateMouseEvent(MouseEvent.MOUSE_RELEASED, 250, 250)); assertSame(Cursor.WAIT.getCurrentFrame(), s.getCursorFrame()); - s.smallSquare.setOnMouseClicked(new EventHandler() { - - @Override - public void handle(MouseEvent event) { - s.smallSquare.setCursor(Cursor.TEXT); - } - }); + s.smallSquare.setOnMouseClicked(event -> s.smallSquare.setCursor(Cursor.TEXT)); s.smallSquare.setCursor(Cursor.HAND); @@ -1621,11 +1564,8 @@ bigSquareTracker = new MouseEventTracker(bigSquare); smallSquareTracker = new MouseEventTracker(smallSquare); - scene.addEventHandler(MouseEvent.ANY, new EventHandler() { - @Override - public void handle(MouseEvent event) { - moused = true; - } + scene.addEventHandler(MouseEvent.ANY, event -> { + moused = true; }); Stage stage = new Stage(); @@ -1673,90 +1613,61 @@ public MouseEventTracker(Node node) { this.node = node; - node.setOnMousePressed(new EventHandler() { - @Override - public void handle(MouseEvent event) { - pressed = true; + node.setOnMousePressed(event -> { + pressed = true; + }); + + node.setOnMouseReleased(event -> { + released = true; + }); + + node.setOnMouseClicked(event -> { + if (event.getClickCount() == 1) { + clicked = true; + } else if (event.getClickCount() == 2) { + doubleClicked = true; } }); - node.setOnMouseReleased(new EventHandler() { - @Override - public void handle(MouseEvent event) { - released = true; + node.setOnMouseMoved(event -> { + moved = true; + }); + + node.setOnMouseDragged(event -> { + dragged = true; + }); + + node.addEventHandler(MouseEvent.MOUSE_ENTERED_TARGET, event -> { + if (event.getTarget() == MouseEventTracker.this.node) { + enteredMe = true; + } else { + enteredChild = true; } }); - node.setOnMouseClicked(new EventHandler() { - @Override - public void handle(MouseEvent event) { - if (event.getClickCount() == 1) { - clicked = true; - } else if (event.getClickCount() == 2) { - doubleClicked = true; - } - } - }); - - node.setOnMouseMoved(new EventHandler() { - @Override - public void handle(MouseEvent event) { - moved = true; - } - }); - - node.setOnMouseDragged(new EventHandler() { - @Override - public void handle(MouseEvent event) { - dragged = true; - } - }); - - node.addEventHandler(MouseEvent.MOUSE_ENTERED_TARGET, new EventHandler() { - @Override - public void handle(MouseEvent event) { - if (event.getTarget() == MouseEventTracker.this.node) { - enteredMe = true; - } else { - enteredChild = true; - } - } - }); - - node.addEventHandler(MouseEvent.MOUSE_EXITED_TARGET, new EventHandler() { - @Override - public void handle(MouseEvent event) { - if (event.getTarget() == MouseEventTracker.this.node) { - exitedMe = true; - } else { - exitedChild = true; - } + node.addEventHandler(MouseEvent.MOUSE_EXITED_TARGET, event -> { + if (event.getTarget() == MouseEventTracker.this.node) { + exitedMe = true; + } else { + exitedChild = true; } }); - node.addEventHandler(MouseEvent.ANY, new EventHandler() { - @Override public void handle(MouseEvent event) { - if (event.getEventType() != MouseEvent.MOUSE_CLICKED) { - lastClickCount = event.getClickCount(); - lastIsStill = event.isStillSincePress(); - } + node.addEventHandler(MouseEvent.ANY, event -> { + if (event.getEventType() != MouseEvent.MOUSE_CLICKED) { + lastClickCount = event.getClickCount(); + lastIsStill = event.isStillSincePress(); } }); } public MouseEventTracker(Scene scene) { - scene.setOnMouseEntered(new EventHandler() { - @Override - public void handle(MouseEvent event) { - enteredMe = true; - } + scene.setOnMouseEntered(event -> { + enteredMe = true; }); - scene.setOnMouseExited(new EventHandler() { - @Override - public void handle(MouseEvent event) { - exitedMe = true; - } + scene.setOnMouseExited(event -> { + exitedMe = true; }); } @@ -1883,16 +1794,13 @@ public EventHandler handler(final EventTarget target, final double x, final double y) { - return new EventHandler() { - @Override - public void handle(MouseEvent event) { - if (target != null) assertSame(target, event.getTarget()); - if (x != DONT_TEST) assertEquals(x, event.getX(), 0.00001); - if (y != DONT_TEST) assertEquals(y, event.getY(), 0.00001); - assertEquals(0.0, event.getZ(), 0.00001); - lastPickResult = event.getPickResult(); - called = true; - } + return event -> { + if (target != null) assertSame(target, event.getTarget()); + if (x != DONT_TEST) assertEquals(x, event.getX(), 0.00001); + if (y != DONT_TEST) assertEquals(y, event.getY(), 0.00001); + assertEquals(0.0, event.getZ(), 0.00001); + lastPickResult = event.getPickResult(); + called = true; }; } diff --git a/modules/graphics/src/test/java/javafx/scene/NodeTest.java b/modules/graphics/src/test/java/javafx/scene/NodeTest.java --- a/modules/graphics/src/test/java/javafx/scene/NodeTest.java +++ b/modules/graphics/src/test/java/javafx/scene/NodeTest.java @@ -686,12 +686,9 @@ } public static final Comparator DEFAULT_OBJ_COMPARATOR = - new Comparator() { - @Override - public int compare(final Object sgValue, final Object pgValue) { - assertEquals(sgValue, pgValue); - return 0; - } + (sgValue, pgValue) -> { + assertEquals(sgValue, pgValue); + return 0; }; public static void testObjectPropertyPropagation( @@ -723,14 +720,11 @@ testObjectPropertyPropagation( node, propertyName, pgPropertyName, initialValue, newValue, - new Comparator() { - @Override - public int compare(final Object sgValue, - final Object pgValue) { - assertEquals(sgValue, convertor.toSg(pgValue)); - return 0; - } - }); + (sgValue, pgValue) -> { + assertEquals(sgValue, convertor.toSg(pgValue)); + return 0; + } + ); } public static void testObjectPropertyPropagation( diff --git a/modules/graphics/src/test/java/javafx/scene/Node_LocalToParentTransform_Test.java b/modules/graphics/src/test/java/javafx/scene/Node_LocalToParentTransform_Test.java --- a/modules/graphics/src/test/java/javafx/scene/Node_LocalToParentTransform_Test.java +++ b/modules/graphics/src/test/java/javafx/scene/Node_LocalToParentTransform_Test.java @@ -82,15 +82,13 @@ @Test public void shouldBeNotifiedWhenNodeTransforms() { final Node n = new Rectangle(20, 20); - n.localToParentTransformProperty().addListener(new InvalidationListener() { - public void invalidated(Observable o) { - if (!notified) { - notified = true; - TransformHelper.assertMatrix(n.getLocalToParentTransform(), - 1, 0, 0, 10, - 0, 1, 0, 20, - 0, 0, 1, 0); - } + n.localToParentTransformProperty().addListener(o -> { + if (!notified) { + notified = true; + TransformHelper.assertMatrix(n.getLocalToParentTransform(), + 1, 0, 0, 10, + 0, 1, 0, 20, + 0, 0, 1, 0); } }); diff --git a/modules/graphics/src/test/java/javafx/scene/Node_LocalToSceneTransform_Test.java b/modules/graphics/src/test/java/javafx/scene/Node_LocalToSceneTransform_Test.java --- a/modules/graphics/src/test/java/javafx/scene/Node_LocalToSceneTransform_Test.java +++ b/modules/graphics/src/test/java/javafx/scene/Node_LocalToSceneTransform_Test.java @@ -113,14 +113,12 @@ @Test public void shouldBeNotifiedWhenThisTransforms() { final Node n = new Rectangle(20, 20); - n.localToSceneTransformProperty().addListener(new InvalidationListener() { - public void invalidated(Observable o) { - notified = true; - TransformHelper.assertMatrix(n.getLocalToSceneTransform(), - 1, 0, 0, 10, - 0, 1, 0, 20, - 0, 0, 1, 0); - } + n.localToSceneTransformProperty().addListener(o -> { + notified = true; + TransformHelper.assertMatrix(n.getLocalToSceneTransform(), + 1, 0, 0, 10, + 0, 1, 0, 20, + 0, 0, 1, 0); }); notified = false; @@ -132,14 +130,12 @@ public void shouldBeNotifiedWhenParentTransforms() { final Node n = new Rectangle(20, 20); final Group g = new Group(n); - n.localToSceneTransformProperty().addListener(new InvalidationListener() { - public void invalidated(Observable o) { - notified = true; - TransformHelper.assertMatrix(n.getLocalToSceneTransform(), - 1, 0, 0, 10, - 0, 1, 0, 20, - 0, 0, 1, 0); - } + n.localToSceneTransformProperty().addListener(o -> { + notified = true; + TransformHelper.assertMatrix(n.getLocalToSceneTransform(), + 1, 0, 0, 10, + 0, 1, 0, 20, + 0, 0, 1, 0); }); notified = false; @@ -154,20 +150,18 @@ final Group g2 = new Group(); g2.setTranslateX(100); - n.localToSceneTransformProperty().addListener(new InvalidationListener() { - public void invalidated(Observable o) { - if (n.getParent() != null) { - notified = true; - TransformHelper.assertMatrix(n.getLocalToSceneTransform(), - 1, 0, 0, 100, - 0, 1, 0, 0, - 0, 0, 1, 0); - } else { - TransformHelper.assertMatrix(n.getLocalToSceneTransform(), - 1, 0, 0, 0, - 0, 1, 0, 0, - 0, 0, 1, 0); - } + n.localToSceneTransformProperty().addListener(o -> { + if (n.getParent() != null) { + notified = true; + TransformHelper.assertMatrix(n.getLocalToSceneTransform(), + 1, 0, 0, 100, + 0, 1, 0, 0, + 0, 0, 1, 0); + } else { + TransformHelper.assertMatrix(n.getLocalToSceneTransform(), + 1, 0, 0, 0, + 0, 1, 0, 0, + 0, 0, 1, 0); } }); @@ -184,18 +178,16 @@ g.setTranslateX(50); g2.setTranslateX(100); - n.localToSceneTransformProperty().addListener(new InvalidationListener() { - public void invalidated(Observable o) { - if (!notified) { - notified = true; - TransformHelper.assertMatrix(n.getLocalToSceneTransform(), - 1, 0, 0, 60, - 0, 1, 0, 0, - 0, 0, 1, 0); - } else { - // enable next invalidation - n.getLocalToSceneTransform(); - } + n.localToSceneTransformProperty().addListener(o -> { + if (!notified) { + notified = true; + TransformHelper.assertMatrix(n.getLocalToSceneTransform(), + 1, 0, 0, 60, + 0, 1, 0, 0, + 0, 0, 1, 0); + } else { + // enable next invalidation + n.getLocalToSceneTransform(); } }); @@ -214,10 +206,8 @@ final Group p1 = new Group(n); final Group p2 = new Group(p1); - InvalidationListener lstnr = new InvalidationListener() { - public void invalidated(Observable o) { - n.getLocalToSceneTransform(); - } + InvalidationListener lstnr = o -> { + n.getLocalToSceneTransform(); }; n.localToSceneTransformProperty().addListener(lstnr); @@ -252,10 +242,8 @@ final Group p1 = new Group(n); final Group p2 = new Group(p1); - InvalidationListener lstnr = new InvalidationListener() { - public void invalidated(Observable o) { - n.getLocalToSceneTransform(); - } + InvalidationListener lstnr = o -> { + n.getLocalToSceneTransform(); }; n.localToSceneTransformProperty().addListener(lstnr); @@ -289,10 +277,8 @@ final Group p2 = new Group(p1); final Group g = new Group(); - InvalidationListener lstnr = new InvalidationListener() { - public void invalidated(Observable o) { - n.getLocalToSceneTransform(); - } + InvalidationListener lstnr = o -> { + n.getLocalToSceneTransform(); }; n.localToSceneTransformProperty().addListener(lstnr); @@ -328,15 +314,11 @@ final Group p2 = new Group(p1); final Group g = new Group(); - InvalidationListener nlstnr = new InvalidationListener() { - public void invalidated(Observable o) { - n.getLocalToSceneTransform(); - } + InvalidationListener nlstnr = o -> { + n.getLocalToSceneTransform(); }; - InvalidationListener plstnr = new InvalidationListener() { - public void invalidated(Observable o) { - p1.getLocalToSceneTransform(); - } + InvalidationListener plstnr = o -> { + p1.getLocalToSceneTransform(); }; n.localToSceneTransformProperty().addListener(nlstnr); @@ -421,14 +403,12 @@ g.setTranslateX(50); // one of the nodes has listener - n.localToSceneTransformProperty().addListener(new InvalidationListener() { - public void invalidated(Observable o) { - notified = true; - TransformHelper.assertMatrix(n.getLocalToSceneTransform(), - 1, 0, 0, 60, - 0, 1, 0, 0, - 0, 0, 1, 0); - } + n.localToSceneTransformProperty().addListener(o -> { + notified = true; + TransformHelper.assertMatrix(n.getLocalToSceneTransform(), + 1, 0, 0, 60, + 0, 1, 0, 0, + 0, 0, 1, 0); }); // the other node reports the value correctly diff --git a/modules/graphics/src/test/java/javafx/scene/Node_properties_Test.java b/modules/graphics/src/test/java/javafx/scene/Node_properties_Test.java --- a/modules/graphics/src/test/java/javafx/scene/Node_properties_Test.java +++ b/modules/graphics/src/test/java/javafx/scene/Node_properties_Test.java @@ -54,10 +54,7 @@ testParent.getChildren().add(testNode); final EventHandler testEventHandler = - new EventHandler() { - @Override - public void handle(Event event) { - } + event -> { }; return Arrays.asList(new Object[] { diff --git a/modules/graphics/src/test/java/javafx/scene/ParentTest.java b/modules/graphics/src/test/java/javafx/scene/ParentTest.java --- a/modules/graphics/src/test/java/javafx/scene/ParentTest.java +++ b/modules/graphics/src/test/java/javafx/scene/ParentTest.java @@ -621,12 +621,8 @@ root.getLayoutBounds(); // validate sub.getBoundsInParent(); // validate - root.layoutBoundsProperty().addListener(new ChangeListener() { - - @Override - public void changed(ObservableValue observable, Bounds oldValue, Bounds newValue) { - // ChangeListener will immediately validate the bounds - } + root.layoutBoundsProperty().addListener((observable, oldValue, newValue) -> { + // ChangeListener will immediately validate the bounds }); sub.clear(); @@ -642,11 +638,7 @@ final Group child = new Group(new Group(), new Group(), new Group()); - child.getChildren().get(1).sceneProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable o) { - child.getChildren().add(2, new Group()); - } - }); + child.getChildren().get(1).sceneProperty().addListener(o -> child.getChildren().add(2, new Group())); root.getChildren().add(child); diff --git a/modules/graphics/src/test/java/javafx/scene/SceneTest.java b/modules/graphics/src/test/java/javafx/scene/SceneTest.java --- a/modules/graphics/src/test/java/javafx/scene/SceneTest.java +++ b/modules/graphics/src/test/java/javafx/scene/SceneTest.java @@ -574,15 +574,12 @@ handler1Called = false; handler2Called = true; - r1.focusedProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue arg0, Boolean arg1, Boolean focused) { - assertFalse(focused); // r1 is being defocused - assertTrue(r2.isFocused()); // r2 is already focused - handler1Called = true; + r1.focusedProperty().addListener((arg0, arg1, focused) -> { + assertFalse(focused); // r1 is being defocused + assertTrue(r2.isFocused()); // r2 is already focused + handler1Called = true; - root.getChildren().remove(r2); // be evil: remove r2 - } + root.getChildren().remove(r2); // be evil: remove r2 }); r2.focusedProperty().addListener(new ChangeListener() { @@ -770,10 +767,8 @@ final Rectangle rect = new Rectangle(); root.getChildren().add(rect); - root.sceneProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable o) { - root.getChildren().remove(rect); - } + root.sceneProperty().addListener(o -> { + root.getChildren().remove(rect); }); Scene scene = new Scene(root, 600, 450); diff --git a/modules/graphics/src/test/java/javafx/scene/Scene_properties_Test.java b/modules/graphics/src/test/java/javafx/scene/Scene_properties_Test.java --- a/modules/graphics/src/test/java/javafx/scene/Scene_properties_Test.java +++ b/modules/graphics/src/test/java/javafx/scene/Scene_properties_Test.java @@ -54,10 +54,7 @@ final TestStage testStage2 = new TestStage("STAGE_2"); final EventHandler testEventHandler = - new EventHandler() { - @Override - public void handle(Event event) { - } + event -> { }; final Configuration windowCfg = diff --git a/modules/graphics/src/test/java/javafx/scene/Scenegraph_eventHandlers_Test.java b/modules/graphics/src/test/java/javafx/scene/Scenegraph_eventHandlers_Test.java --- a/modules/graphics/src/test/java/javafx/scene/Scenegraph_eventHandlers_Test.java +++ b/modules/graphics/src/test/java/javafx/scene/Scenegraph_eventHandlers_Test.java @@ -339,12 +339,7 @@ private static final Event TEST_EVENT = new Event(new EventType()); private static final EventHandler EVENT_CONSUMING_HANDLER = - new EventHandler() { - @Override - public void handle(final Event event) { - event.consume(); - } - }; + event -> event.consume(); private static final class EventCountingHandler implements EventHandler { diff --git a/modules/graphics/src/test/java/javafx/scene/image/ImageTest.java b/modules/graphics/src/test/java/javafx/scene/image/ImageTest.java --- a/modules/graphics/src/test/java/javafx/scene/image/ImageTest.java +++ b/modules/graphics/src/test/java/javafx/scene/image/ImageTest.java @@ -370,13 +370,10 @@ getLastAsyncImageLoader(); final InvalidationListener imageChecker = - new InvalidationListener() { - @Override - public void invalidated(final Observable observable) { - assertEquals(200, image.getWidth(), 0); - assertEquals(100, image.getHeight(), 0); - assertNotNull(image.impl_getPlatformImage()); - } + observable -> { + assertEquals(200, image.getWidth(), 0); + assertEquals(100, image.getHeight(), 0); + assertNotNull(image.impl_getPlatformImage()); }; image.widthProperty().addListener(imageChecker); diff --git a/modules/graphics/src/test/java/javafx/scene/image/ImageViewTest.java b/modules/graphics/src/test/java/javafx/scene/image/ImageViewTest.java --- a/modules/graphics/src/test/java/javafx/scene/image/ImageViewTest.java +++ b/modules/graphics/src/test/java/javafx/scene/image/ImageViewTest.java @@ -88,21 +88,18 @@ imageView, "image", "image", null, TestImages.TEST_IMAGE_200x100, - new Comparator() { - @Override - public int compare(final Object sgValue, - final Object pgValue) { - if (sgValue == null) { - assertNull(pgValue); - } else { - assertSame( - ((Image) sgValue).impl_getPlatformImage(), - pgValue); - } + (sgValue, pgValue) -> { + if (sgValue == null) { + assertNull(pgValue); + } else { + assertSame( + ((Image) sgValue).impl_getPlatformImage(), + pgValue); + } - return 0; - } - }); + return 0; + } + ); } @Test diff --git a/modules/graphics/src/test/java/javafx/scene/input/ContextMenuEventTest.java b/modules/graphics/src/test/java/javafx/scene/input/ContextMenuEventTest.java --- a/modules/graphics/src/test/java/javafx/scene/input/ContextMenuEventTest.java +++ b/modules/graphics/src/test/java/javafx/scene/input/ContextMenuEventTest.java @@ -39,6 +39,7 @@ import javafx.geometry.Point3D; import javafx.stage.Stage; +import org.junit.Assert; import org.junit.Test; public class ContextMenuEventTest { @@ -160,16 +161,14 @@ stage.show(); rect.requestFocus(); - rect.setOnContextMenuRequested(new EventHandler() { - @Override public void handle(ContextMenuEvent event) { - assertEquals(1.0, event.getX(), 0.0001); - assertEquals(101, event.getSceneX(), 0.0001); - assertEquals(201, event.getScreenX(), 0.0001); - assertEquals(2.0, event.getY(), 0.0001); - assertEquals(102, event.getSceneY(), 0.0001); - assertEquals(202, event.getScreenY(), 0.0001); - assertFalse(event.isKeyboardTrigger()); - } + rect.setOnContextMenuRequested(event -> { + Assert.assertEquals(1.0, event.getX(), 0.0001); + Assert.assertEquals(101, event.getSceneX(), 0.0001); + Assert.assertEquals(201, event.getScreenX(), 0.0001); + Assert.assertEquals(2.0, event.getY(), 0.0001); + Assert.assertEquals(102, event.getSceneY(), 0.0001); + Assert.assertEquals(202, event.getScreenY(), 0.0001); + assertFalse(event.isKeyboardTrigger()); }); ((StubScene) scene.impl_getPeer()).getListener().menuEvent( @@ -187,16 +186,14 @@ stage.show(); rect.requestFocus(); - rect.setOnContextMenuRequested(new EventHandler() { - @Override public void handle(ContextMenuEvent event) { - assertEquals(25.0, event.getX(), 0.0001); - assertEquals(125, event.getSceneX(), 0.0001); - assertEquals(225, event.getScreenX(), 0.0001); - assertEquals(50.0, event.getY(), 0.0001); - assertEquals(150, event.getSceneY(), 0.0001); - assertEquals(250, event.getScreenY(), 0.0001); - assertTrue(event.isKeyboardTrigger()); - } + rect.setOnContextMenuRequested(event -> { + Assert.assertEquals(25.0, event.getX(), 0.0001); + Assert.assertEquals(125, event.getSceneX(), 0.0001); + Assert.assertEquals(225, event.getScreenX(), 0.0001); + Assert.assertEquals(50.0, event.getY(), 0.0001); + Assert.assertEquals(150, event.getSceneY(), 0.0001); + Assert.assertEquals(250, event.getScreenY(), 0.0001); + assertTrue(event.isKeyboardTrigger()); }); ((StubScene) scene.impl_getPeer()).getListener().menuEvent( @@ -216,30 +213,26 @@ stage.show(); rect.requestFocus(); - rect.setOnContextMenuRequested(new EventHandler() { - @Override public void handle(ContextMenuEvent event) { - assertEquals(1.0, event.getX(), 0.0001); - assertEquals(101, event.getSceneX(), 0.0001); - assertEquals(201, event.getScreenX(), 0.0001); - assertEquals(2.0, event.getY(), 0.0001); - assertEquals(102, event.getSceneY(), 0.0001); - assertEquals(202, event.getScreenY(), 0.0001); - assertEquals(0, event.getZ(), 0.0001); - assertFalse(event.isKeyboardTrigger()); - } + rect.setOnContextMenuRequested(event -> { + Assert.assertEquals(1.0, event.getX(), 0.0001); + Assert.assertEquals(101, event.getSceneX(), 0.0001); + Assert.assertEquals(201, event.getScreenX(), 0.0001); + Assert.assertEquals(2.0, event.getY(), 0.0001); + Assert.assertEquals(102, event.getSceneY(), 0.0001); + Assert.assertEquals(202, event.getScreenY(), 0.0001); + Assert.assertEquals(0, event.getZ(), 0.0001); + assertFalse(event.isKeyboardTrigger()); }); - scene.setOnContextMenuRequested(new EventHandler() { - @Override public void handle(ContextMenuEvent event) { - assertEquals(101.0, event.getX(), 0.0001); - assertEquals(101, event.getSceneX(), 0.0001); - assertEquals(201, event.getScreenX(), 0.0001); - assertEquals(102.0, event.getY(), 0.0001); - assertEquals(102, event.getSceneY(), 0.0001); - assertEquals(202, event.getScreenY(), 0.0001); - assertEquals(50, event.getZ(), 0.0001); - assertFalse(event.isKeyboardTrigger()); - } + scene.setOnContextMenuRequested(event -> { + Assert.assertEquals(101.0, event.getX(), 0.0001); + Assert.assertEquals(101, event.getSceneX(), 0.0001); + Assert.assertEquals(201, event.getScreenX(), 0.0001); + Assert.assertEquals(102.0, event.getY(), 0.0001); + Assert.assertEquals(102, event.getSceneY(), 0.0001); + Assert.assertEquals(202, event.getScreenY(), 0.0001); + Assert.assertEquals(50, event.getZ(), 0.0001); + assertFalse(event.isKeyboardTrigger()); }); ((StubScene) scene.impl_getPeer()).getListener().menuEvent( @@ -257,15 +250,13 @@ stage.show(); rect.requestFocus(); - rect.setOnContextMenuRequested(new EventHandler() { - @Override public void handle(ContextMenuEvent event) { - PickResult pickRes = event.getPickResult(); - assertNotNull(pickRes); - assertSame(rect, pickRes.getIntersectedNode()); - assertEquals(25, pickRes.getIntersectedPoint().getX(), 0.00001); - assertEquals(50, pickRes.getIntersectedPoint().getY(), 0.00001); - assertEquals(0, pickRes.getIntersectedPoint().getZ(), 0.00001); - } + rect.setOnContextMenuRequested(event -> { + PickResult pickRes = event.getPickResult(); + assertNotNull(pickRes); + assertSame(rect, pickRes.getIntersectedNode()); + assertEquals(25, pickRes.getIntersectedPoint().getX(), 0.00001); + assertEquals(50, pickRes.getIntersectedPoint().getY(), 0.00001); + assertEquals(0, pickRes.getIntersectedPoint().getZ(), 0.00001); }); ((StubScene) scene.impl_getPeer()).getListener().menuEvent( diff --git a/modules/graphics/src/test/java/javafx/scene/input/DragAndDropTest.java b/modules/graphics/src/test/java/javafx/scene/input/DragAndDropTest.java --- a/modules/graphics/src/test/java/javafx/scene/input/DragAndDropTest.java +++ b/modules/graphics/src/test/java/javafx/scene/input/DragAndDropTest.java @@ -45,6 +45,7 @@ import javafx.util.Pair; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -251,16 +252,12 @@ Node n = oneNode(); MouseEventGenerator gen = new MouseEventGenerator(); - EventHandler thirdEventFailsHysteresis = - new EventHandler() { - - @Override - public void handle(MouseEvent event) { - counter++; - assertTrue((counter != 3 && !event.isDragDetect()) || - (counter == 3 && event.isDragDetect())); - } - }; + EventHandler thirdEventFailsHysteresis = + event -> { + counter++; + assertTrue((counter != 3 && !event.isDragDetect()) || + (counter == 3 && event.isDragDetect())); + }; n.addEventHandler(MouseEvent.MOUSE_PRESSED, thirdEventFailsHysteresis); n.addEventHandler(MouseEvent.MOUSE_DRAGGED, thirdEventFailsHysteresis); @@ -375,10 +372,8 @@ final MouseEventGenerator gen = new MouseEventGenerator(); n.setOnMousePressed(doDetect); - n.setOnDragDetected(new EventHandler() { - @Override public void handle(MouseEvent event) { - n.startDragAndDrop(TransferMode.COPY); - } + n.setOnDragDetected(event -> { + n.startDragAndDrop(TransferMode.COPY); }); n.getScene().impl_processMouseEvent( @@ -417,11 +412,9 @@ dragSource = n.getParent(); n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); - n.setOnDragOver(new EventHandler() { - @Override public void handle(DragEvent event) { - assertSame(dragSource, event.getGestureSource()); - counter++; - } + n.setOnDragOver(event -> { + assertSame(dragSource, event.getGestureSource()); + counter++; }); n.getScene().impl_processMouseEvent( @@ -439,11 +432,9 @@ dragSource = n.getParent(); n.setOnMousePressed(doDetect); n.getParent().setOnDragDetected(stringSource(TransferMode.ANY)); - n.setOnDragOver(new EventHandler() { - @Override public void handle(DragEvent event) { - assertSame(dragSource, event.getGestureSource()); - counter++; - } + n.setOnDragOver(event -> { + assertSame(dragSource, event.getGestureSource()); + counter++; }); n.getScene().impl_processMouseEvent( @@ -461,22 +452,18 @@ dragSource = n; n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); - n.setOnDragOver(new EventHandler() { - @Override public void handle(DragEvent event) { - event.acceptTransferModes(TransferMode.ANY); - if (counter == 0) { - assertNull(event.getGestureTarget()); - } else { - assertSame(n, event.getGestureTarget()); - } - counter++; + n.setOnDragOver(event -> { + event.acceptTransferModes(TransferMode.ANY); + if (counter == 0) { + assertNull(event.getGestureTarget()); + } else { + assertSame(n, event.getGestureTarget()); } + counter++; }); - n.setOnDragDropped(new EventHandler() { - @Override public void handle(DragEvent event) { - assertSame(n, event.getGestureTarget()); - counter++; - } + n.setOnDragDropped(event -> { + assertSame(n, event.getGestureTarget()); + counter++; }); n.getScene().impl_processMouseEvent( @@ -496,23 +483,19 @@ dragSource = n; n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); - n.setOnDragOver(new EventHandler() { - @Override public void handle(DragEvent event) { - event.acceptTransferModes(TransferMode.ANY); - if (counter == 0) { - assertNull(event.getGestureTarget()); - } else { - assertSame(n.getParent(), event.getGestureTarget()); - } - counter++; + n.setOnDragOver(event -> { + event.acceptTransferModes(TransferMode.ANY); + if (counter == 0) { + assertNull(event.getGestureTarget()); + } else { + assertSame(n.getParent(), event.getGestureTarget()); } + counter++; }); n.getParent().setOnDragOver(acceptAny); - n.setOnDragDropped(new EventHandler() { - @Override public void handle(DragEvent event) { - assertSame(n.getParent(), event.getGestureTarget()); - counter++; - } + n.setOnDragDropped(event -> { + assertSame(n.getParent(), event.getGestureTarget()); + counter++; }); n.getScene().impl_processMouseEvent( @@ -530,19 +513,15 @@ final MouseEventGenerator gen = new MouseEventGenerator(); n.setOnMousePressed(doDetect); - n.getScene().setOnDragDetected(new EventHandler() { - @Override public void handle(MouseEvent event) { - Dragboard db = n.getScene().startDragAndDrop(TransferMode.ANY); - ClipboardContent cc = new ClipboardContent(); - cc.putString("Hello"); - db.setContent(cc); - } + n.getScene().setOnDragDetected(event -> { + Dragboard db = n.getScene().startDragAndDrop(TransferMode.ANY); + ClipboardContent cc = new ClipboardContent(); + cc.putString("Hello"); + db.setContent(cc); }); - n.setOnDragOver(new EventHandler() { - @Override public void handle(DragEvent event) { - assertSame(n.getScene(), event.getGestureSource()); - counter++; - } + n.setOnDragOver(event -> { + assertSame(n.getScene(), event.getGestureSource()); + counter++; }); n.getScene().impl_processMouseEvent( @@ -560,22 +539,18 @@ dragSource = n; n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); - n.getScene().setOnDragOver(new EventHandler() { - @Override public void handle(DragEvent event) { - event.acceptTransferModes(TransferMode.ANY); - if (counter == 0) { - assertNull(event.getGestureTarget()); - } else { - assertSame(n.getScene(), event.getGestureTarget()); - } - counter++; + n.getScene().setOnDragOver(event -> { + event.acceptTransferModes(TransferMode.ANY); + if (counter == 0) { + assertNull(event.getGestureTarget()); + } else { + assertSame(n.getScene(), event.getGestureTarget()); } + counter++; }); - n.setOnDragDropped(new EventHandler() { - @Override public void handle(DragEvent event) { - assertSame(n.getScene(), event.getGestureTarget()); - counter++; - } + n.setOnDragDropped(event -> { + assertSame(n.getScene(), event.getGestureTarget()); + counter++; }); n.getScene().impl_processMouseEvent( @@ -727,12 +702,10 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); n.setOnDragOver(acceptCopy); - n.setOnDragDropped(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - assertSame(TransferMode.COPY, event.getTransferMode()); - assertSame(TransferMode.COPY, event.getAcceptedTransferMode()); - } + n.setOnDragDropped(event -> { + counter++; + assertSame(TransferMode.COPY, event.getTransferMode()); + assertSame(TransferMode.COPY, event.getAcceptedTransferMode()); }); /* start drag */ @@ -755,15 +728,13 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); n.setOnDragOver(acceptCopy); - n.setOnDragDropped(new EventHandler() { - @Override public void handle(DragEvent event) { - assertSame(TransferMode.COPY, event.getTransferMode()); - assertSame(TransferMode.COPY, event.getAcceptedTransferMode()); - event.acceptTransferModes(TransferMode.MOVE); - event.setDropCompleted(true); - assertSame(TransferMode.COPY, event.getTransferMode()); - assertSame(TransferMode.MOVE, event.getAcceptedTransferMode()); - } + n.setOnDragDropped(event -> { + assertSame(TransferMode.COPY, event.getTransferMode()); + assertSame(TransferMode.COPY, event.getAcceptedTransferMode()); + event.acceptTransferModes(TransferMode.MOVE); + event.setDropCompleted(true); + assertSame(TransferMode.COPY, event.getTransferMode()); + assertSame(TransferMode.MOVE, event.getAcceptedTransferMode()); }); /* start drag */ @@ -784,15 +755,13 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.COPY_OR_MOVE)); n.setOnDragOver(acceptCopy); - n.setOnDragDropped(new EventHandler() { - @Override public void handle(DragEvent event) { - try { - event.acceptTransferModes(TransferMode.LINK); - fail("Exception was not thrown"); - } catch (IllegalStateException e) { - /* expceted */ - counter++; - } + n.setOnDragDropped(event -> { + try { + event.acceptTransferModes(TransferMode.LINK); + fail("Exception was not thrown"); + } catch (IllegalStateException e) { + /* expceted */ + counter++; } }); @@ -823,11 +792,9 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); n.setOnDragOver(acceptCopyOrMove); - n.setOnDragDropped(new EventHandler() { - @Override public void handle(DragEvent event) { - event.acceptTransferModes(TransferMode.ANY); - event.setDropCompleted(true); - } + n.setOnDragDropped(event -> { + event.acceptTransferModes(TransferMode.ANY); + event.setDropCompleted(true); }); /* start drag */ @@ -859,10 +826,8 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); n.setOnDragOver(acceptCopy); - n.setOnDragDropped(new EventHandler() { - @Override public void handle(DragEvent event) { - event.setDropCompleted(true); - } + n.setOnDragDropped(event -> { + event.setDropCompleted(true); }); /* start drag */ @@ -883,10 +848,8 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); n.setOnDragOver(acceptCopy); - n.setOnDragDropped(new EventHandler() { - @Override public void handle(DragEvent event) { - event.setDropCompleted(false); - } + n.setOnDragDropped(event -> { + event.setDropCompleted(false); }); /* start drag */ @@ -926,15 +889,11 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); n.setOnDragOver(acceptCopyOrMove); - n.setOnDragDropped(new EventHandler() { - @Override public void handle(DragEvent event) { - event.setDropCompleted(false); - } + n.setOnDragDropped(event -> { + event.setDropCompleted(false); }); - n.getParent().setOnDragDropped(new EventHandler() { - @Override public void handle(DragEvent event) { - event.setDropCompleted(true); - } + n.getParent().setOnDragDropped(event -> { + event.setDropCompleted(true); }); /* start drag */ @@ -958,17 +917,13 @@ src.setOnMousePressed(doDetect); src.setOnDragDetected(stringSource(TransferMode.ANY)); trgt.setOnDragOver(acceptCopyOrMove); - trgt.setOnDragDropped(new EventHandler() { - @Override public void handle(DragEvent event) { - event.setDropCompleted(true); - } + trgt.setOnDragDropped(event -> { + event.setDropCompleted(true); }); - src.getParent().setOnDragDone(new EventHandler() { - @Override public void handle(DragEvent event) { - assertEquals(TransferMode.MOVE, event.getTransferMode()); - assertEquals(TransferMode.MOVE, event.getAcceptedTransferMode()); - counter++; - } + src.getParent().setOnDragDone(event -> { + Assert.assertEquals(TransferMode.MOVE, event.getTransferMode()); + Assert.assertEquals(TransferMode.MOVE, event.getAcceptedTransferMode()); + counter++; }); /* start drag */ @@ -996,10 +951,8 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); n.setOnDragOver(acceptAny); - n.setOnDragEntered(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - } + n.setOnDragEntered(event -> { + counter++; }); /* start drag */ @@ -1021,10 +974,8 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); n.setOnDragOver(acceptAny); - n.getParent().setOnDragEntered(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - } + n.getParent().setOnDragEntered(event -> { + counter++; }); /* start drag */ @@ -1047,15 +998,11 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); n.setOnDragOver(acceptAny); - subScene.setOnDragEntered(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - } + subScene.setOnDragEntered(event -> { + counter++; }); - subScene.getParent().setOnDragEntered(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - } + subScene.getParent().setOnDragEntered(event -> { + counter++; }); /* start drag */ @@ -1078,12 +1025,11 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); n.setOnDragOver(acceptAny); - n.getParent().addEventHandler(DragEvent.DRAG_ENTERED_TARGET, - new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - } - }); + n.getParent().addEventHandler(DragEvent.DRAG_ENTERED_TARGET, + event -> { + counter++; + } + ); /* start drag */ n.getScene().impl_processMouseEvent( @@ -1104,10 +1050,8 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); n.setOnDragOver(acceptAny); - n.setOnDragExited(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - } + n.setOnDragExited(event -> { + counter++; }); /* start drag */ @@ -1133,15 +1077,11 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); n.setOnDragOver(acceptAny); - subScene.setOnDragExited(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - } + subScene.setOnDragExited(event -> { + counter++; }); - subScene.getParent().setOnDragExited(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - } + subScene.getParent().setOnDragExited(event -> { + counter++; }); /* start drag */ @@ -1167,10 +1107,8 @@ n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); n.setOnDragOver(acceptAny); - n.setOnDragEntered(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - } + n.setOnDragEntered(event -> { + counter++; }); /* start drag */ @@ -1200,10 +1138,8 @@ src.setOnMousePressed(doDetect); src.setOnDragDetected(stringSource(TransferMode.ANY)); src.setOnDragOver(acceptAny); - trgt.setOnDragEntered(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - } + trgt.setOnDragEntered(event -> { + counter++; }); /* start drag */ @@ -1230,10 +1166,8 @@ src.setOnMousePressed(doDetect); src.setOnDragDetected(stringSource(TransferMode.ANY)); src.setOnDragOver(acceptAny); - trgt.setOnDragExited(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - } + trgt.setOnDragExited(event -> { + counter++; }); /* start drag */ @@ -1263,10 +1197,8 @@ src.setOnMousePressed(doDetect); src.setOnDragDetected(stringSource(TransferMode.ANY)); src.setOnDragOver(acceptAny); - trgt.getParent().setOnDragExited(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - } + trgt.getParent().setOnDragExited(event -> { + counter++; }); /* start drag */ @@ -1297,11 +1229,10 @@ src.setOnDragDetected(stringSource(TransferMode.ANY)); src.setOnDragOver(acceptAny); trgt.getParent().addEventHandler(DragEvent.DRAG_EXITED_TARGET, - new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - } - }); + event -> { + counter++; + } + ); /* start drag */ src.getScene().impl_processMouseEvent( @@ -1329,13 +1260,11 @@ final Image img = new Image("file:testImg_" + 100 + "x" + 100 + ".png"); n.setOnMousePressed(doDetect); - n.setOnDragDetected(new EventHandler() { - @Override public void handle(MouseEvent event) { - Dragboard db = n.startDragAndDrop(TransferMode.COPY); - db.setDragView(img); - db.setDragViewOffsetX(20); - db.setDragViewOffsetX(15); - } + n.setOnDragDetected(event -> { + Dragboard db = n.startDragAndDrop(TransferMode.COPY); + db.setDragView(img); + db.setDragViewOffsetX(20); + db.setDragViewOffsetX(15); }); n.getScene().impl_processMouseEvent( @@ -1356,16 +1285,14 @@ dragSource = n; n.setOnMousePressed(doDetect); - n.setOnDragDetected( new EventHandler() { - @Override public void handle(MouseEvent event) { - Dragboard db = dragSource.startDragAndDrop(TransferMode.ANY); - ClipboardContent cc = new ClipboardContent(); - cc.putString("Hello"); - db.setContent(cc); - db.setDragView(img); - db.setDragViewOffsetX(20); - db.setDragViewOffsetX(15); - } + n.setOnDragDetected(event -> { + Dragboard db = dragSource.startDragAndDrop(TransferMode.ANY); + ClipboardContent cc = new ClipboardContent(); + cc.putString("Hello"); + db.setContent(cc); + db.setDragView(img); + db.setDragViewOffsetX(20); + db.setDragViewOffsetX(15); }); n.getScene().impl_processMouseEvent( @@ -1384,37 +1311,33 @@ dragSource = n; n.setOnMousePressed(doDetect); - n.setOnDragDetected( new EventHandler() { - @Override public void handle(MouseEvent event) { - Dragboard db = dragSource.startDragAndDrop(TransferMode.ANY); - ClipboardContent cc = new ClipboardContent(); - cc.putString("Hello"); - db.setContent(cc); - db.setDragView(img); - db.setDragViewOffsetX(20); - db.setDragViewOffsetY(15); - } + n.setOnDragDetected(event -> { + Dragboard db = dragSource.startDragAndDrop(TransferMode.ANY); + ClipboardContent cc = new ClipboardContent(); + cc.putString("Hello"); + db.setContent(cc); + db.setDragView(img); + db.setDragViewOffsetX(20); + db.setDragViewOffsetY(15); }); - parent.setOnDragDetected( new EventHandler() { - @Override public void handle(MouseEvent event) { - Dragboard db = dragSource.startDragAndDrop(TransferMode.ANY); - ClipboardContent cc = new ClipboardContent(); - cc.putString("HelloParent"); - db.setContent(cc); + parent.setOnDragDetected(event -> { + Dragboard db = dragSource.startDragAndDrop(TransferMode.ANY); + ClipboardContent cc = new ClipboardContent(); + cc.putString("HelloParent"); + db.setContent(cc); - assertEquals(img, db.getDragView()); - assertEquals(20, db.getDragViewOffsetX(), 1e-10); - assertEquals(15, db.getDragViewOffsetY(), 1e-10); - - db.setDragView(imgParent); - db.setDragViewOffsetX(40); - db.setDragViewOffsetY(55); - - assertEquals(imgParent, db.getDragView()); - assertEquals(40, db.getDragViewOffsetX(), 1e-10); - assertEquals(55, db.getDragViewOffsetY(), 1e-10); - } + assertEquals(img, db.getDragView()); + assertEquals(20, db.getDragViewOffsetX(), 1e-10); + assertEquals(15, db.getDragViewOffsetY(), 1e-10); + + db.setDragView(imgParent); + db.setDragViewOffsetX(40); + db.setDragViewOffsetY(55); + + assertEquals(imgParent, db.getDragView()); + assertEquals(40, db.getDragViewOffsetX(), 1e-10); + assertEquals(55, db.getDragViewOffsetY(), 1e-10); }); n.getScene().impl_processMouseEvent( @@ -1431,35 +1354,31 @@ dragSource = n; n.setOnMousePressed(doDetect); - n.setOnDragDetected( new EventHandler() { - @Override public void handle(MouseEvent event) { - Dragboard db = dragSource.startDragAndDrop(TransferMode.ANY); - ClipboardContent cc = new ClipboardContent(); - cc.putString("Hello"); - db.setContent(cc); - db.setDragView(img, 20, 15); - } + n.setOnDragDetected(event -> { + Dragboard db = dragSource.startDragAndDrop(TransferMode.ANY); + ClipboardContent cc = new ClipboardContent(); + cc.putString("Hello"); + db.setContent(cc); + db.setDragView(img, 20, 15); }); - parent.setOnDragDetected( new EventHandler() { - @Override public void handle(MouseEvent event) { - Dragboard db = dragSource.startDragAndDrop(TransferMode.ANY); - ClipboardContent cc = new ClipboardContent(); - cc.putString("HelloParent"); - db.setContent(cc); + parent.setOnDragDetected(event -> { + Dragboard db = dragSource.startDragAndDrop(TransferMode.ANY); + ClipboardContent cc = new ClipboardContent(); + cc.putString("HelloParent"); + db.setContent(cc); - assertEquals(img, db.getDragView()); - assertEquals(20, db.getDragViewOffsetX(), 1e-10); - assertEquals(15, db.getDragViewOffsetY(), 1e-10); - - db.setDragView(imgParent); - db.setDragViewOffsetX(40); - db.setDragViewOffsetY(55); - - assertEquals(imgParent, db.getDragView()); - assertEquals(40, db.getDragViewOffsetX(), 1e-10); - assertEquals(55, db.getDragViewOffsetY(), 1e-10); - } + assertEquals(img, db.getDragView()); + assertEquals(20, db.getDragViewOffsetX(), 1e-10); + assertEquals(15, db.getDragViewOffsetY(), 1e-10); + + db.setDragView(imgParent); + db.setDragViewOffsetX(40); + db.setDragViewOffsetY(55); + + assertEquals(imgParent, db.getDragView()); + assertEquals(40, db.getDragViewOffsetX(), 1e-10); + assertEquals(55, db.getDragViewOffsetY(), 1e-10); }); n.getScene().impl_processMouseEvent( @@ -1474,21 +1393,19 @@ dragSource = n; n.setOnMousePressed(doDetect); - n.setOnDragDetected( new EventHandler() { - @Override public void handle(MouseEvent event) { - Dragboard db = dragSource.startDragAndDrop(TransferMode.ANY); + n.setOnDragDetected(event -> { + Dragboard db = dragSource.startDragAndDrop(TransferMode.ANY); - assertNull(db.getDragView()); - assertEquals(0, db.getDragViewOffsetX(), 1e-10); - assertEquals(0, db.getDragViewOffsetY(), 1e-10); + assertNull(db.getDragView()); + assertEquals(0, db.getDragViewOffsetX(), 1e-10); + assertEquals(0, db.getDragViewOffsetY(), 1e-10); - ClipboardContent cc = new ClipboardContent(); - cc.putString("Hello"); - db.setContent(cc); - db.setDragView(img); - db.setDragViewOffsetX(20); - db.setDragViewOffsetX(15); - } + ClipboardContent cc = new ClipboardContent(); + cc.putString("Hello"); + db.setContent(cc); + db.setDragView(img); + db.setDragViewOffsetX(20); + db.setDragViewOffsetX(15); }); n.getScene().impl_processMouseEvent( @@ -1516,22 +1433,18 @@ counter = 0; n.setOnMousePressed(doDetect); n.setOnDragDetected(stringSource(TransferMode.ANY)); - n.setOnDragOver(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - assertEquals(52, event.getX(), 0.00001); - assertEquals(52, event.getY(), 0.00001); - assertEquals(0, event.getZ(), 0.00001); - } + n.setOnDragOver(event -> { + counter++; + Assert.assertEquals(52, event.getX(), 0.00001); + Assert.assertEquals(52, event.getY(), 0.00001); + Assert.assertEquals(0, event.getZ(), 0.00001); }); - n.getScene().setOnDragOver(new EventHandler() { - @Override public void handle(DragEvent event) { - counter++; - assertEquals(52, event.getX(), 0.00001); - assertEquals(52, event.getY(), 0.00001); - assertEquals(50, event.getZ(), 0.00001); - } + n.getScene().setOnDragOver(event -> { + counter++; + Assert.assertEquals(52, event.getX(), 0.00001); + Assert.assertEquals(52, event.getY(), 0.00001); + Assert.assertEquals(50, event.getZ(), 0.00001); }); n.getScene().impl_processMouseEvent( @@ -1553,43 +1466,37 @@ dragSource = n1; n1.setOnMousePressed(doDetect); n1.setOnDragDetected(stringSource(TransferMode.ANY)); - n1.setOnDragOver(new EventHandler() { - @Override public void handle(DragEvent event) { - PickResult pickRes = event.getPickResult(); - assertNotNull(pickRes); - assertSame(n1, pickRes.getIntersectedNode()); - assertEquals(52, pickRes.getIntersectedPoint().getX(), 0.00001); - assertEquals(52, pickRes.getIntersectedPoint().getY(), 0.00001); - assertEquals(0, pickRes.getIntersectedPoint().getZ(), 0.00001); - counter++; - } + n1.setOnDragOver(event -> { + PickResult pickRes = event.getPickResult(); + assertNotNull(pickRes); + assertSame(n1, pickRes.getIntersectedNode()); + assertEquals(52, pickRes.getIntersectedPoint().getX(), 0.00001); + assertEquals(52, pickRes.getIntersectedPoint().getY(), 0.00001); + assertEquals(0, pickRes.getIntersectedPoint().getZ(), 0.00001); + counter++; }); - EventHandler switchNodeHandler = new EventHandler() { - @Override public void handle(DragEvent event) { - PickResult pickRes = event.getPickResult(); - assertNotNull(pickRes); - assertSame(n2, pickRes.getIntersectedNode()); - assertEquals(252, pickRes.getIntersectedPoint().getX(), 0.00001); - assertEquals(52, pickRes.getIntersectedPoint().getY(), 0.00001); - assertEquals(0, pickRes.getIntersectedPoint().getZ(), 0.00001); - event.acceptTransferModes(TransferMode.COPY); - counter++; - } + EventHandler switchNodeHandler = event -> { + PickResult pickRes = event.getPickResult(); + assertNotNull(pickRes); + assertSame(n2, pickRes.getIntersectedNode()); + assertEquals(252, pickRes.getIntersectedPoint().getX(), 0.00001); + assertEquals(52, pickRes.getIntersectedPoint().getY(), 0.00001); + assertEquals(0, pickRes.getIntersectedPoint().getZ(), 0.00001); + event.acceptTransferModes(TransferMode.COPY); + counter++; }; n1.setOnDragExited(switchNodeHandler); n2.setOnDragEntered(switchNodeHandler); n2.setOnDragOver(switchNodeHandler); n2.setOnDragDropped(switchNodeHandler); - n1.setOnDragDone(new EventHandler() { - @Override public void handle(DragEvent event) { - PickResult pickRes = event.getPickResult(); - assertNotNull(pickRes); - assertNull(pickRes.getIntersectedNode()); - assertEquals(0, pickRes.getIntersectedPoint().getX(), 0.00001); - assertEquals(0, pickRes.getIntersectedPoint().getY(), 0.00001); - assertEquals(0, pickRes.getIntersectedPoint().getZ(), 0.00001); - counter++; - } + n1.setOnDragDone(event -> { + PickResult pickRes = event.getPickResult(); + assertNotNull(pickRes); + assertNull(pickRes.getIntersectedNode()); + assertEquals(0, pickRes.getIntersectedPoint().getX(), 0.00001); + assertEquals(0, pickRes.getIntersectedPoint().getY(), 0.00001); + assertEquals(0, pickRes.getIntersectedPoint().getZ(), 0.00001); + counter++; }); n1.getScene().impl_processMouseEvent( @@ -1609,19 +1516,11 @@ // Event handlers - private final EventHandler dontDetect = - new EventHandler() { - @Override public void handle(MouseEvent event) { - event.setDragDetect(false); - } - }; + private final EventHandler dontDetect = + event -> event.setDragDetect(false); - private final EventHandler doDetect = - new EventHandler() { - @Override public void handle(MouseEvent event) { - event.setDragDetect(true); - } - }; + private final EventHandler doDetect = + event -> event.setDragDetect(true); private final EventHandler detector = new EventHandler() { @@ -1631,36 +1530,22 @@ }; private EventHandler stringSource(final TransferMode... tms) { - return new EventHandler() { - @Override public void handle(MouseEvent event) { - Dragboard db = dragSource.startDragAndDrop(tms); - ClipboardContent cc = new ClipboardContent(); - cc.putString("Hello"); - db.setContent(cc); - } + return event -> { + Dragboard db = dragSource.startDragAndDrop(tms); + ClipboardContent cc = new ClipboardContent(); + cc.putString("Hello"); + db.setContent(cc); }; } - private final EventHandler acceptAny = - new EventHandler() { - @Override public void handle(DragEvent event) { - event.acceptTransferModes(TransferMode.ANY); - } - }; + private final EventHandler acceptAny = + event -> event.acceptTransferModes(TransferMode.ANY); - private final EventHandler acceptCopyOrMove = - new EventHandler() { - @Override public void handle(DragEvent event) { - event.acceptTransferModes(TransferMode.COPY_OR_MOVE); - } - }; + private final EventHandler acceptCopyOrMove = + event -> event.acceptTransferModes(TransferMode.COPY_OR_MOVE); - private final EventHandler acceptCopy = - new EventHandler() { - @Override public void handle(DragEvent event) { - event.acceptTransferModes(TransferMode.COPY); - } - }; + private final EventHandler acceptCopy = + event -> event.acceptTransferModes(TransferMode.COPY); // Scenes diff --git a/modules/graphics/src/test/java/javafx/scene/input/MouseDragEventTest.java b/modules/graphics/src/test/java/javafx/scene/input/MouseDragEventTest.java --- a/modules/graphics/src/test/java/javafx/scene/input/MouseDragEventTest.java +++ b/modules/graphics/src/test/java/javafx/scene/input/MouseDragEventTest.java @@ -757,45 +757,31 @@ targetParent = new HandledNode(targetParentNode); root = new HandledNode(rootNode); - sourceNode.setOnDragDetected(new EventHandler() { - @Override public void handle(MouseEvent event) { - sourceNode.startFullDrag(); - } - }); + sourceNode.setOnDragDetected(event -> sourceNode.startFullDrag()); - belowSourceNode.setOnDragDetected(new EventHandler() { - @Override public void handle(MouseEvent event) { - sourceParentNode.startFullDrag(); - } - }); + belowSourceNode.setOnDragDetected(event -> sourceParentNode.startFullDrag()); if (sourceDragged) { - sourceNode.setOnMousePressed(new EventHandler() { - @Override public void handle(MouseEvent event) { - anchorX = event.getSceneX(); - anchorY = event.getSceneY(); - if (sourceMouseTransparent) { - sourceNode.setMouseTransparent(true); - } + sourceNode.setOnMousePressed(event -> { + anchorX = event.getSceneX(); + anchorY = event.getSceneY(); + if (sourceMouseTransparent) { + sourceNode.setMouseTransparent(true); } }); - sourceNode.setOnMouseDragged(new EventHandler() { - @Override public void handle(MouseEvent event) { - sourceNode.setTranslateX(sourceNode.getTranslateX() - + event.getSceneX() - anchorX); - sourceNode.setTranslateY(sourceNode.getTranslateY() - + event.getSceneY() - anchorY); - anchorX = event.getSceneX(); - anchorY = event.getSceneY(); - } + sourceNode.setOnMouseDragged(event -> { + sourceNode.setTranslateX(sourceNode.getTranslateX() + + event.getSceneX() - anchorX); + sourceNode.setTranslateY(sourceNode.getTranslateY() + + event.getSceneY() - anchorY); + anchorX = event.getSceneX(); + anchorY = event.getSceneY(); }); - sourceNode.setOnMouseReleased(new EventHandler() { - @Override public void handle(MouseEvent event) { - if (sourceMouseTransparent) { - sourceNode.setMouseTransparent(false); - } + sourceNode.setOnMouseReleased(event -> { + if (sourceMouseTransparent) { + sourceNode.setMouseTransparent(false); } }); } diff --git a/modules/graphics/src/test/java/javafx/scene/input/RotateEventTest.java b/modules/graphics/src/test/java/javafx/scene/input/RotateEventTest.java --- a/modules/graphics/src/test/java/javafx/scene/input/RotateEventTest.java +++ b/modules/graphics/src/test/java/javafx/scene/input/RotateEventTest.java @@ -34,6 +34,7 @@ import javafx.scene.Scene; import javafx.scene.shape.Rectangle; import javafx.stage.Stage; +import org.junit.Assert; import org.junit.Test; import static org.junit.Assert.*; @@ -188,10 +189,8 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); rotated = false; - rect.setOnRotate(new EventHandler() { - @Override public void handle(RotateEvent event) { - rotated = true; - } + rect.setOnRotate(event -> { + rotated = true; }); ((StubScene) scene.impl_getPeer()).getListener().rotateEvent( @@ -214,12 +213,10 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); rotated = false; - rect.setOnRotate(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertEquals(90, event.getAngle(), 0.0001); - assertEquals(-180, event.getTotalAngle(), 0.0001); - rotated = true; - } + rect.setOnRotate(event -> { + Assert.assertEquals(90, event.getAngle(), 0.0001); + Assert.assertEquals(-180, event.getTotalAngle(), 0.0001); + rotated = true; }); ((StubScene) scene.impl_getPeer()).getListener().rotateEvent( @@ -236,14 +233,12 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); rotated = false; - rect.setOnRotate(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertTrue(event.isShiftDown()); - assertFalse(event.isControlDown()); - assertTrue(event.isAltDown()); - assertFalse(event.isMetaDown()); - rotated = true; - } + rect.setOnRotate(event -> { + assertTrue(event.isShiftDown()); + assertFalse(event.isControlDown()); + assertTrue(event.isAltDown()); + assertFalse(event.isMetaDown()); + rotated = true; }); ((StubScene) scene.impl_getPeer()).getListener().rotateEvent( RotateEvent.ROTATE, 2, 3, @@ -251,14 +246,12 @@ assertTrue(rotated); rotated = false; - rect.setOnRotate(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertFalse(event.isShiftDown()); - assertTrue(event.isControlDown()); - assertFalse(event.isAltDown()); - assertTrue(event.isMetaDown()); - rotated = true; - } + rect.setOnRotate(event -> { + assertFalse(event.isShiftDown()); + assertTrue(event.isControlDown()); + assertFalse(event.isAltDown()); + assertTrue(event.isMetaDown()); + rotated = true; }); ((StubScene) scene.impl_getPeer()).getListener().rotateEvent( RotateEvent.ROTATE, 2, 3, @@ -273,11 +266,9 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); rotated = false; - rect.setOnRotate(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertTrue(event.isDirect()); - rotated = true; - } + rect.setOnRotate(event -> { + assertTrue(event.isDirect()); + rotated = true; }); ((StubScene) scene.impl_getPeer()).getListener().rotateEvent( RotateEvent.ROTATE, 2, 3, @@ -285,11 +276,9 @@ assertTrue(rotated); rotated = false; - rect.setOnRotate(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertFalse(event.isDirect()); - rotated = true; - } + rect.setOnRotate(event -> { + assertFalse(event.isDirect()); + rotated = true; }); ((StubScene) scene.impl_getPeer()).getListener().rotateEvent( RotateEvent.ROTATE, 2, 3, @@ -304,11 +293,9 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); rotated = false; - rect.setOnRotate(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertTrue(event.isInertia()); - rotated = true; - } + rect.setOnRotate(event -> { + assertTrue(event.isInertia()); + rotated = true; }); ((StubScene) scene.impl_getPeer()).getListener().rotateEvent( RotateEvent.ROTATE, 2, 3, @@ -316,11 +303,9 @@ assertTrue(rotated); rotated = false; - rect.setOnRotate(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertFalse(event.isInertia()); - rotated = true; - } + rect.setOnRotate(event -> { + assertFalse(event.isInertia()); + rotated = true; }); ((StubScene) scene.impl_getPeer()).getListener().rotateEvent( RotateEvent.ROTATE, 2, 3, @@ -335,10 +320,8 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); rotated = false; - rect.setOnRotationStarted(new EventHandler() { - @Override public void handle(RotateEvent event) { - rotated = true; - } + rect.setOnRotationStarted(event -> { + rotated = true; }); ((StubScene) scene.impl_getPeer()).getListener().rotateEvent( RotateEvent.ROTATION_STARTED, 2, 3, @@ -346,10 +329,8 @@ assertTrue(rotated); rotated = false; - rect.setOnRotationFinished(new EventHandler() { - @Override public void handle(RotateEvent event) { - rotated = true; - } + rect.setOnRotationFinished(event -> { + rotated = true; }); ((StubScene) scene.impl_getPeer()).getListener().rotateEvent( RotateEvent.ROTATION_FINISHED, 2, 3, @@ -363,10 +344,8 @@ Rectangle rect = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); - rect.addEventHandler(RotateEvent.ANY, new EventHandler() { - @Override public void handle(RotateEvent event) { - rotated = true; - } + rect.addEventHandler(RotateEvent.ANY, event -> { + rotated = true; }); rotated = false; @@ -396,15 +375,11 @@ Rectangle rect2 = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); - rect1.addEventHandler(RotateEvent.ANY, new EventHandler() { - @Override public void handle(RotateEvent event) { - rotated = true; - } + rect1.addEventHandler(RotateEvent.ANY, event -> { + rotated = true; }); - rect2.addEventHandler(RotateEvent.ANY, new EventHandler() { - @Override public void handle(RotateEvent event) { - rotated2 = true; - } + rect2.addEventHandler(RotateEvent.ANY, event -> { + rotated2 = true; }); rotated = false; @@ -441,22 +416,18 @@ rotated = false; rotated2 = false; - rect.setOnRotate(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertEquals(150, event.getX(), 0.00001); - assertEquals(150, event.getY(), 0.00001); - assertEquals(0, event.getZ(), 0.00001); - rotated = true; - } + rect.setOnRotate(event -> { + Assert.assertEquals(150, event.getX(), 0.00001); + Assert.assertEquals(150, event.getY(), 0.00001); + Assert.assertEquals(0, event.getZ(), 0.00001); + rotated = true; }); - scene.setOnRotate(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertEquals(150, event.getX(), 0.00001); - assertEquals(150, event.getY(), 0.00001); - assertEquals(50, event.getZ(), 0.00001); - rotated2 = true; - } + scene.setOnRotate(event -> { + Assert.assertEquals(150, event.getX(), 0.00001); + Assert.assertEquals(150, event.getY(), 0.00001); + Assert.assertEquals(50, event.getZ(), 0.00001); + rotated2 = true; }); ((StubScene) scene.impl_getPeer()).getListener().rotateEvent( @@ -475,17 +446,13 @@ Rectangle rect2 = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); - rect1.addEventHandler(RotateEvent.ANY, new EventHandler() { - @Override public void handle(RotateEvent event) { - pickRes = event.getPickResult(); - rotated = true; - } + rect1.addEventHandler(RotateEvent.ANY, event -> { + pickRes = event.getPickResult(); + rotated = true; }); - rect2.addEventHandler(RotateEvent.ANY, new EventHandler() { - @Override public void handle(RotateEvent event) { - pickRes = event.getPickResult(); - rotated2 = true; - } + rect2.addEventHandler(RotateEvent.ANY, event -> { + pickRes = event.getPickResult(); + rotated2 = true; }); rotated = false; @@ -538,22 +505,18 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); Rectangle rect2 = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); - rect1.addEventHandler(RotateEvent.ANY, new EventHandler() { - @Override public void handle(RotateEvent event) { - rotated = true; - } + rect1.addEventHandler(RotateEvent.ANY, event -> { + rotated = true; }); MouseEventGenerator generator = new MouseEventGenerator(); rotated = false; rotated2 = false; - rect2.setOnRotationStarted(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertEquals(250.0, event.getSceneX(), 0.0001); - assertEquals(250.0, event.getSceneY(), 0.0001); - rotated2 = true; - } + rect2.setOnRotationStarted(event -> { + Assert.assertEquals(250.0, event.getSceneX(), 0.0001); + Assert.assertEquals(250.0, event.getSceneY(), 0.0001); + rotated2 = true; }); scene.impl_processMouseEvent(generator.generateMouseEvent( MouseEvent.MOUSE_MOVED, 250, 250)); @@ -566,12 +529,10 @@ rotated = false; rotated2 = false; - rect2.setOnRotate(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertEquals(150.0, event.getSceneX(), 0.0001); - assertEquals(150.0, event.getSceneY(), 0.0001); - rotated2 = true; - } + rect2.setOnRotate(event -> { + Assert.assertEquals(150.0, event.getSceneX(), 0.0001); + Assert.assertEquals(150.0, event.getSceneY(), 0.0001); + rotated2 = true; }); scene.impl_processMouseEvent(generator.generateMouseEvent( MouseEvent.MOUSE_MOVED, 150, 150)); @@ -584,12 +545,10 @@ rotated = false; rotated2 = false; - rect2.setOnRotationFinished(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertEquals(150.0, event.getSceneX(), 0.0001); - assertEquals(150.0, event.getSceneY(), 0.0001); - rotated2 = true; - } + rect2.setOnRotationFinished(event -> { + Assert.assertEquals(150.0, event.getSceneX(), 0.0001); + Assert.assertEquals(150.0, event.getSceneY(), 0.0001); + rotated2 = true; }); ((StubScene) scene.impl_getPeer()).getListener().rotateEvent( RotateEvent.ROTATION_FINISHED, 2, 3, @@ -604,12 +563,10 @@ Scene scene = createScene(); Rectangle rect = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); - rect.setOnRotationFinished(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertEquals(250.0, event.getSceneX(), 0.0001); - assertEquals(250.0, event.getSceneY(), 0.0001); - rotated = true; - } + rect.setOnRotationFinished(event -> { + Assert.assertEquals(250.0, event.getSceneX(), 0.0001); + Assert.assertEquals(250.0, event.getSceneY(), 0.0001); + rotated = true; }); rotated = false; @@ -638,12 +595,10 @@ Scene scene = createScene(); Rectangle rect = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); - rect.setOnRotate(new EventHandler() { - @Override public void handle(RotateEvent event) { - assertEquals(150.0, event.getSceneX(), 0.0001); - assertEquals(150.0, event.getSceneY(), 0.0001); - rotated = true; - } + rect.setOnRotate(event -> { + Assert.assertEquals(150.0, event.getSceneX(), 0.0001); + Assert.assertEquals(150.0, event.getSceneY(), 0.0001); + rotated = true; }); rotated = false; diff --git a/modules/graphics/src/test/java/javafx/scene/input/ScrollEventTest.java b/modules/graphics/src/test/java/javafx/scene/input/ScrollEventTest.java --- a/modules/graphics/src/test/java/javafx/scene/input/ScrollEventTest.java +++ b/modules/graphics/src/test/java/javafx/scene/input/ScrollEventTest.java @@ -34,6 +34,7 @@ import javafx.scene.Scene; import javafx.scene.shape.Rectangle; import javafx.stage.Stage; +import org.junit.Assert; import org.junit.Test; import static org.junit.Assert.*; @@ -209,10 +210,8 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); scrolled = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - scrolled = true; - } + rect.setOnScroll(event -> { + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( @@ -235,14 +234,12 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); scrolled = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertEquals(66.0, event.getDeltaX(), 0.0001); - assertEquals(99.0, event.getDeltaY(), 0.0001); - assertEquals(132.0, event.getTotalDeltaX(), 0.0001); - assertEquals(198.0, event.getTotalDeltaY(), 0.0001); - scrolled = true; - } + rect.setOnScroll(event -> { + Assert.assertEquals(66.0, event.getDeltaX(), 0.0001); + Assert.assertEquals(99.0, event.getDeltaY(), 0.0001); + Assert.assertEquals(132.0, event.getTotalDeltaX(), 0.0001); + Assert.assertEquals(198.0, event.getTotalDeltaY(), 0.0001); + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( @@ -259,14 +256,12 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); scrolled = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertEquals(0.0, event.getTextDeltaX(), 0.0001); - assertEquals(0.0, event.getTextDeltaY(), 0.0001); - assertSame(ScrollEvent.HorizontalTextScrollUnits.NONE, event.getTextDeltaXUnits()); - assertSame(ScrollEvent.VerticalTextScrollUnits.NONE, event.getTextDeltaYUnits()); - scrolled = true; - } + rect.setOnScroll(event -> { + Assert.assertEquals(0.0, event.getTextDeltaX(), 0.0001); + Assert.assertEquals(0.0, event.getTextDeltaY(), 0.0001); + assertSame(ScrollEvent.HorizontalTextScrollUnits.NONE, event.getTextDeltaXUnits()); + assertSame(ScrollEvent.VerticalTextScrollUnits.NONE, event.getTextDeltaYUnits()); + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL, 2, 3, 4, 6, 33, 33, 0, 0, 0, 0, 0, @@ -274,14 +269,12 @@ assertTrue(scrolled); scrolled = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertEquals(8.0, event.getTextDeltaX(), 0.0001); - assertEquals(15.0, event.getTextDeltaY(), 0.0001); - assertSame(ScrollEvent.HorizontalTextScrollUnits.CHARACTERS, event.getTextDeltaXUnits()); - assertSame(ScrollEvent.VerticalTextScrollUnits.LINES, event.getTextDeltaYUnits()); - scrolled = true; - } + rect.setOnScroll(event -> { + Assert.assertEquals(8.0, event.getTextDeltaX(), 0.0001); + Assert.assertEquals(15.0, event.getTextDeltaY(), 0.0001); + assertSame(ScrollEvent.HorizontalTextScrollUnits.CHARACTERS, event.getTextDeltaXUnits()); + assertSame(ScrollEvent.VerticalTextScrollUnits.LINES, event.getTextDeltaYUnits()); + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL, 2, 3, 4, 6, 33, 33, 1, 4, 5, 3, 3, @@ -289,14 +282,12 @@ assertTrue(scrolled); scrolled = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertEquals(0.0, event.getTextDeltaX(), 0.0001); - assertEquals(3.0, event.getTextDeltaY(), 0.0001); - assertSame(ScrollEvent.HorizontalTextScrollUnits.NONE, event.getTextDeltaXUnits()); - assertSame(ScrollEvent.VerticalTextScrollUnits.PAGES, event.getTextDeltaYUnits()); - scrolled = true; - } + rect.setOnScroll(event -> { + Assert.assertEquals(0.0, event.getTextDeltaX(), 0.0001); + Assert.assertEquals(3.0, event.getTextDeltaY(), 0.0001); + assertSame(ScrollEvent.HorizontalTextScrollUnits.NONE, event.getTextDeltaXUnits()); + assertSame(ScrollEvent.VerticalTextScrollUnits.PAGES, event.getTextDeltaYUnits()); + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL, 2, 3, 4, 6, 33, 33, 5, -1, -1, 3, 3, @@ -312,14 +303,12 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); scrolled = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertTrue(event.isShiftDown()); - assertFalse(event.isControlDown()); - assertTrue(event.isAltDown()); - assertFalse(event.isMetaDown()); - scrolled = true; - } + rect.setOnScroll(event -> { + assertTrue(event.isShiftDown()); + assertFalse(event.isControlDown()); + assertTrue(event.isAltDown()); + assertFalse(event.isMetaDown()); + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL, 2, 3, 4, 6, 33, 33, 1, 1, 1, 3, 3, @@ -327,14 +316,12 @@ assertTrue(scrolled); scrolled = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertFalse(event.isShiftDown()); - assertTrue(event.isControlDown()); - assertFalse(event.isAltDown()); - assertTrue(event.isMetaDown()); - scrolled = true; - } + rect.setOnScroll(event -> { + assertFalse(event.isShiftDown()); + assertTrue(event.isControlDown()); + assertFalse(event.isAltDown()); + assertTrue(event.isMetaDown()); + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL, 2, 3, 4, 6, 33, 33, 1, 1, 1, 3, 3, @@ -349,11 +336,9 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); scrolled = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertTrue(event.isDirect()); - scrolled = true; - } + rect.setOnScroll(event -> { + assertTrue(event.isDirect()); + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL, 2, 3, 4, 6, 33, 33, 1, 1, 1, 3, 3, @@ -361,11 +346,9 @@ assertTrue(scrolled); scrolled = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertFalse(event.isDirect()); - scrolled = true; - } + rect.setOnScroll(event -> { + assertFalse(event.isDirect()); + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL, 2, 3, 4, 6, 33, 33, 1, 1, 1, 3, 3, @@ -380,11 +363,9 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); scrolled = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertTrue(event.isInertia()); - scrolled = true; - } + rect.setOnScroll(event -> { + assertTrue(event.isInertia()); + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL, 2, 3, 4, 6, 33, 33, 1, 1, 1, 3, 3, @@ -392,11 +373,9 @@ assertTrue(scrolled); scrolled = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertFalse(event.isInertia()); - scrolled = true; - } + rect.setOnScroll(event -> { + assertFalse(event.isInertia()); + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL, 2, 3, 4, 6, 33, 33, 1, 1, 1, 3, 3, @@ -411,11 +390,9 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); scrolled = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertEquals(0, event.getTouchCount()); - scrolled = true; - } + rect.setOnScroll(event -> { + Assert.assertEquals(0, event.getTouchCount()); + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL, 2, 3, 4, 6, 33, 33, 0, 1, 1, 3, 3, @@ -423,11 +400,9 @@ assertTrue(scrolled); scrolled = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertEquals(5, event.getTouchCount()); - scrolled = true; - } + rect.setOnScroll(event -> { + Assert.assertEquals(5, event.getTouchCount()); + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL, 2, 3, 4, 6, 33, 33, 5, 1, 1, 3, 3, @@ -442,10 +417,8 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); scrolled = false; - rect.setOnScrollStarted(new EventHandler() { - @Override public void handle(ScrollEvent event) { - scrolled = true; - } + rect.setOnScrollStarted(event -> { + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL_STARTED, 2, 3, 4, 6, 33, 33, 0, 1, 1, 3, 3, @@ -453,10 +426,8 @@ assertTrue(scrolled); scrolled = false; - rect.setOnScrollFinished(new EventHandler() { - @Override public void handle(ScrollEvent event) { - scrolled = true; - } + rect.setOnScrollFinished(event -> { + scrolled = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL_FINISHED, 2, 3, 4, 6, 33, 33, 5, 1, 1, 3, 3, @@ -470,10 +441,8 @@ Rectangle rect = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); - rect.addEventHandler(ScrollEvent.ANY, new EventHandler() { - @Override public void handle(ScrollEvent event) { - scrolled = true; - } + rect.addEventHandler(ScrollEvent.ANY, event -> { + scrolled = true; }); scrolled = false; @@ -503,15 +472,11 @@ Rectangle rect2 = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); - rect1.addEventHandler(ScrollEvent.ANY, new EventHandler() { - @Override public void handle(ScrollEvent event) { - scrolled = true; - } + rect1.addEventHandler(ScrollEvent.ANY, event -> { + scrolled = true; }); - rect2.addEventHandler(ScrollEvent.ANY, new EventHandler() { - @Override public void handle(ScrollEvent event) { - scrolled2 = true; - } + rect2.addEventHandler(ScrollEvent.ANY, event -> { + scrolled2 = true; }); scrolled = false; @@ -557,22 +522,18 @@ scrolled = false; scrolled2 = false; - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertEquals(150, event.getX(), 0.00001); - assertEquals(150, event.getY(), 0.00001); - assertEquals(0, event.getZ(), 0.00001); - scrolled = true; - } + rect.setOnScroll(event -> { + Assert.assertEquals(150, event.getX(), 0.00001); + Assert.assertEquals(150, event.getY(), 0.00001); + Assert.assertEquals(0, event.getZ(), 0.00001); + scrolled = true; }); - scene.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertEquals(150, event.getX(), 0.00001); - assertEquals(150, event.getY(), 0.00001); - assertEquals(50, event.getZ(), 0.00001); - scrolled2 = true; - } + scene.setOnScroll(event -> { + Assert.assertEquals(150, event.getX(), 0.00001); + Assert.assertEquals(150, event.getY(), 0.00001); + Assert.assertEquals(50, event.getZ(), 0.00001); + scrolled2 = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( @@ -591,17 +552,13 @@ Rectangle rect2 = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); - rect1.addEventHandler(ScrollEvent.ANY, new EventHandler() { - @Override public void handle(ScrollEvent event) { - pickRes = event.getPickResult(); - scrolled = true; - } + rect1.addEventHandler(ScrollEvent.ANY, event -> { + pickRes = event.getPickResult(); + scrolled = true; }); - rect2.addEventHandler(ScrollEvent.ANY, new EventHandler() { - @Override public void handle(ScrollEvent event) { - pickRes = event.getPickResult(); - scrolled2 = true; - } + rect2.addEventHandler(ScrollEvent.ANY, event -> { + pickRes = event.getPickResult(); + scrolled2 = true; }); scrolled = false; @@ -670,15 +627,11 @@ Rectangle rect2 = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); - rect1.addEventHandler(ScrollEvent.ANY, new EventHandler() { - @Override public void handle(ScrollEvent event) { - scrolled = true; - } + rect1.addEventHandler(ScrollEvent.ANY, event -> { + scrolled = true; }); - rect2.addEventHandler(ScrollEvent.ANY, new EventHandler() { - @Override public void handle(ScrollEvent event) { - scrolled2 = true; - } + rect2.addEventHandler(ScrollEvent.ANY, event -> { + scrolled2 = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( @@ -726,22 +679,18 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); Rectangle rect2 = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); - rect1.addEventHandler(ScrollEvent.ANY, new EventHandler() { - @Override public void handle(ScrollEvent event) { - scrolled = true; - } + rect1.addEventHandler(ScrollEvent.ANY, event -> { + scrolled = true; }); MouseEventGenerator generator = new MouseEventGenerator(); scrolled = false; scrolled2 = false; - rect2.setOnScrollStarted(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertEquals(250.0, event.getSceneX(), 0.0001); - assertEquals(250.0, event.getSceneY(), 0.0001); - scrolled2 = true; - } + rect2.setOnScrollStarted(event -> { + Assert.assertEquals(250.0, event.getSceneX(), 0.0001); + Assert.assertEquals(250.0, event.getSceneY(), 0.0001); + scrolled2 = true; }); scene.impl_processMouseEvent(generator.generateMouseEvent( MouseEvent.MOUSE_MOVED, 250, 250)); @@ -754,12 +703,10 @@ scrolled = false; scrolled2 = false; - rect2.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertEquals(150.0, event.getSceneX(), 0.0001); - assertEquals(150.0, event.getSceneY(), 0.0001); - scrolled2 = true; - } + rect2.setOnScroll(event -> { + Assert.assertEquals(150.0, event.getSceneX(), 0.0001); + Assert.assertEquals(150.0, event.getSceneY(), 0.0001); + scrolled2 = true; }); scene.impl_processMouseEvent(generator.generateMouseEvent( MouseEvent.MOUSE_MOVED, 150, 150)); @@ -772,12 +719,10 @@ scrolled = false; scrolled2 = false; - rect2.setOnScrollFinished(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertEquals(150.0, event.getSceneX(), 0.0001); - assertEquals(150.0, event.getSceneY(), 0.0001); - scrolled2 = true; - } + rect2.setOnScrollFinished(event -> { + Assert.assertEquals(150.0, event.getSceneX(), 0.0001); + Assert.assertEquals(150.0, event.getSceneY(), 0.0001); + scrolled2 = true; }); ((StubScene) scene.impl_getPeer()).getListener().scrollEvent( ScrollEvent.SCROLL_FINISHED, 2, 3, 4, 6, 33, 33, 0, 1, 1, 3, 3, @@ -792,12 +737,10 @@ Scene scene = createScene(); Rectangle rect = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); - rect.setOnScrollFinished(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertEquals(250.0, event.getSceneX(), 0.0001); - assertEquals(250.0, event.getSceneY(), 0.0001); - scrolled = true; - } + rect.setOnScrollFinished(event -> { + Assert.assertEquals(250.0, event.getSceneX(), 0.0001); + Assert.assertEquals(250.0, event.getSceneY(), 0.0001); + scrolled = true; }); scrolled = false; @@ -827,12 +770,10 @@ Rectangle rect = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); - rect.setOnScroll(new EventHandler() { - @Override public void handle(ScrollEvent event) { - assertEquals(150.0, event.getSceneX(), 0.0001); - assertEquals(150.0, event.getSceneY(), 0.0001); - scrolled = true; - } + rect.setOnScroll(event -> { + Assert.assertEquals(150.0, event.getSceneX(), 0.0001); + Assert.assertEquals(150.0, event.getSceneY(), 0.0001); + scrolled = true; }); scrolled = false; diff --git a/modules/graphics/src/test/java/javafx/scene/input/SwipeEventTest.java b/modules/graphics/src/test/java/javafx/scene/input/SwipeEventTest.java --- a/modules/graphics/src/test/java/javafx/scene/input/SwipeEventTest.java +++ b/modules/graphics/src/test/java/javafx/scene/input/SwipeEventTest.java @@ -34,6 +34,7 @@ import javafx.scene.Scene; import javafx.scene.shape.Rectangle; import javafx.stage.Stage; +import org.junit.Assert; import org.junit.Test; import static org.junit.Assert.*; @@ -179,10 +180,8 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); swiped = false; - rect.setOnSwipeLeft(new EventHandler() { - @Override public void handle(SwipeEvent event) { - swiped = true; - } + rect.setOnSwipeLeft(event -> { + swiped = true; }); ((StubScene) scene.impl_getPeer()).getListener().swipeEvent( @@ -206,11 +205,9 @@ swiped = false; - rect.setOnSwipeUp(new EventHandler() { - @Override public void handle(SwipeEvent event) { - assertEquals(3, event.getTouchCount()); - swiped = true; - } + rect.setOnSwipeUp(event -> { + Assert.assertEquals(3, event.getTouchCount()); + swiped = true; }); ((StubScene) scene.impl_getPeer()).getListener().swipeEvent( @@ -228,14 +225,12 @@ swiped = false; - rect.setOnSwipeUp(new EventHandler() { - @Override public void handle(SwipeEvent event) { - assertEquals(151.0, event.getX(), 0.0001); - assertEquals(152.0, event.getY(), 0.0001); - assertEquals(153.0, event.getScreenX(), 0.0001); - assertEquals(154.0, event.getScreenY(), 0.0001); - swiped = true; - } + rect.setOnSwipeUp(event -> { + Assert.assertEquals(151.0, event.getX(), 0.0001); + Assert.assertEquals(152.0, event.getY(), 0.0001); + Assert.assertEquals(153.0, event.getScreenX(), 0.0001); + Assert.assertEquals(154.0, event.getScreenY(), 0.0001); + swiped = true; }); ((StubScene) scene.impl_getPeer()).getListener().swipeEvent( @@ -253,11 +248,9 @@ swiped = false; - rect.setOnSwipeDown(new EventHandler() { - @Override public void handle(SwipeEvent event) { - assertEquals(swiped, event.isDirect()); - swiped = !swiped; - } + rect.setOnSwipeDown(event -> { + Assert.assertEquals(swiped, event.isDirect()); + swiped = !swiped; }); ((StubScene) scene.impl_getPeer()).getListener().swipeEvent( @@ -282,22 +275,18 @@ swiped = false; swiped2 = false; - rect.setOnSwipeLeft(new EventHandler() { - @Override public void handle(SwipeEvent event) { - assertEquals(150, event.getX(), 0.00001); - assertEquals(150, event.getY(), 0.00001); - assertEquals(0, event.getZ(), 0.00001); - swiped = true; - } + rect.setOnSwipeLeft(event -> { + Assert.assertEquals(150, event.getX(), 0.00001); + Assert.assertEquals(150, event.getY(), 0.00001); + Assert.assertEquals(0, event.getZ(), 0.00001); + swiped = true; }); - scene.setOnSwipeLeft(new EventHandler() { - @Override public void handle(SwipeEvent event) { - assertEquals(150, event.getX(), 0.00001); - assertEquals(150, event.getY(), 0.00001); - assertEquals(50, event.getZ(), 0.00001); - swiped2 = true; - } + scene.setOnSwipeLeft(event -> { + Assert.assertEquals(150, event.getX(), 0.00001); + Assert.assertEquals(150, event.getY(), 0.00001); + Assert.assertEquals(50, event.getZ(), 0.00001); + swiped2 = true; }); ((StubScene) scene.impl_getPeer()).getListener().swipeEvent( @@ -316,16 +305,14 @@ swiped = false; - rect.setOnSwipeUp(new EventHandler() { - @Override public void handle(SwipeEvent event) { - PickResult pickRes = event.getPickResult(); - assertNotNull(pickRes); - assertSame(rect, pickRes.getIntersectedNode()); - assertEquals(151, pickRes.getIntersectedPoint().getX(), 0.00001); - assertEquals(152, pickRes.getIntersectedPoint().getY(), 0.00001); - assertEquals(0, pickRes.getIntersectedPoint().getZ(), 0.00001); - swiped = true; - } + rect.setOnSwipeUp(event -> { + PickResult pickRes = event.getPickResult(); + assertNotNull(pickRes); + assertSame(rect, pickRes.getIntersectedNode()); + assertEquals(151, pickRes.getIntersectedPoint().getX(), 0.00001); + assertEquals(152, pickRes.getIntersectedPoint().getY(), 0.00001); + assertEquals(0, pickRes.getIntersectedPoint().getZ(), 0.00001); + swiped = true; }); ((StubScene) scene.impl_getPeer()).getListener().swipeEvent( @@ -341,10 +328,8 @@ Rectangle rect = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); - rect.addEventHandler(SwipeEvent.ANY, new EventHandler() { - @Override public void handle(SwipeEvent event) { - swiped = true; - } + rect.addEventHandler(SwipeEvent.ANY, event -> { + swiped = true; }); swiped = false; @@ -379,12 +364,10 @@ Rectangle rect = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); - rect.setOnSwipeRight(new EventHandler() { - @Override public void handle(SwipeEvent event) { - assertEquals(150.0, event.getSceneX(), 0.0001); - assertEquals(150.0, event.getSceneY(), 0.0001); - swiped = true; - } + rect.setOnSwipeRight(event -> { + Assert.assertEquals(150.0, event.getSceneX(), 0.0001); + Assert.assertEquals(150.0, event.getSceneY(), 0.0001); + swiped = true; }); swiped = false; diff --git a/modules/graphics/src/test/java/javafx/scene/input/TouchEventTest.java b/modules/graphics/src/test/java/javafx/scene/input/TouchEventTest.java --- a/modules/graphics/src/test/java/javafx/scene/input/TouchEventTest.java +++ b/modules/graphics/src/test/java/javafx/scene/input/TouchEventTest.java @@ -36,6 +36,7 @@ import javafx.stage.Stage; import javafx.event.EventHandler; import javafx.geometry.Point3D; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.*; @@ -176,31 +177,29 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); touched = 0; - rect.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 1: - assertEquals(true, event.isShiftDown()); - assertEquals(false, event.isControlDown()); - assertEquals(true, event.isAltDown()); - assertEquals(false, event.isMetaDown()); - break; - case 2: - assertEquals(false, event.isShiftDown()); - assertEquals(true, event.isControlDown()); - assertEquals(false, event.isAltDown()); - assertEquals(true, event.isMetaDown()); - break; - case 3: - assertEquals(false, event.isShiftDown()); - assertEquals(true, event.isControlDown()); - assertEquals(true, event.isAltDown()); - assertEquals(false, event.isMetaDown()); - break; - default: - fail("Wrong touch point id " + event.getTouchPoint().getId()); - } + rect.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 1: + Assert.assertEquals(true, event.isShiftDown()); + Assert.assertEquals(false, event.isControlDown()); + Assert.assertEquals(true, event.isAltDown()); + Assert.assertEquals(false, event.isMetaDown()); + break; + case 2: + Assert.assertEquals(false, event.isShiftDown()); + Assert.assertEquals(true, event.isControlDown()); + Assert.assertEquals(false, event.isAltDown()); + Assert.assertEquals(true, event.isMetaDown()); + break; + case 3: + Assert.assertEquals(false, event.isShiftDown()); + Assert.assertEquals(true, event.isControlDown()); + Assert.assertEquals(true, event.isAltDown()); + Assert.assertEquals(false, event.isMetaDown()); + break; + default: + fail("Wrong touch point id " + event.getTouchPoint().getId()); } }); @@ -232,31 +231,29 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); touched = 0; - rect.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 1: - assertEquals(1, event.getTouchCount()); - assertEquals(1, event.getTouchPoints().size()); - break; - case 2: - case 3: - assertEquals(2, event.getTouchCount()); - assertEquals(2, event.getTouchPoints().size()); - break; - case 4: - case 5: - assertEquals(2, event.getTouchCount()); - assertEquals(2, event.getTouchPoints().size()); - break; - case 6: - assertEquals(1, event.getTouchCount()); - assertEquals(1, event.getTouchPoints().size()); - break; - default: - fail("Wrong touch point id " + event.getTouchPoint().getId()); - } + rect.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 1: + Assert.assertEquals(1, event.getTouchCount()); + Assert.assertEquals(1, event.getTouchPoints().size()); + break; + case 2: + case 3: + Assert.assertEquals(2, event.getTouchCount()); + Assert.assertEquals(2, event.getTouchPoints().size()); + break; + case 4: + case 5: + Assert.assertEquals(2, event.getTouchCount()); + Assert.assertEquals(2, event.getTouchPoints().size()); + break; + case 6: + Assert.assertEquals(1, event.getTouchCount()); + Assert.assertEquals(1, event.getTouchPoints().size()); + break; + default: + fail("Wrong touch point id " + event.getTouchPoint().getId()); } }); @@ -298,27 +295,25 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); touched = 0; - rect.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 1: - assertEquals(1, event.getEventSetId()); - break; - case 2: - case 3: - assertEquals(2, event.getEventSetId()); - break; - case 4: - case 5: - assertEquals(3, event.getEventSetId()); - break; - case 6: - assertEquals(4, event.getEventSetId()); - break; - default: - fail("Wrong touch point id " + event.getTouchPoint().getId()); - } + rect.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 1: + Assert.assertEquals(1, event.getEventSetId()); + break; + case 2: + case 3: + Assert.assertEquals(2, event.getEventSetId()); + break; + case 4: + case 5: + Assert.assertEquals(3, event.getEventSetId()); + break; + case 6: + Assert.assertEquals(4, event.getEventSetId()); + break; + default: + fail("Wrong touch point id " + event.getTouchPoint().getId()); } }); @@ -360,28 +355,26 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); touched = 0; - rect.setOnTouchPressed(new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(event.getTouchPoint().getId()) { - case 1: - assertEquals(110.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(110.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(1, touched); - break; - case 2: - assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(2, touched); - break; - case 3: - assertEquals(130.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(130.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(3, touched); - break; - default: - fail("Wrong touch point id " + event.getTouchPoint().getId()); - } + rect.setOnTouchPressed(event -> { + touched++; + switch(event.getTouchPoint().getId()) { + case 1: + Assert.assertEquals(110.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(110.0, event.getTouchPoint().getY(), 0.0001); + assertEquals(1, touched); + break; + case 2: + Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); + assertEquals(2, touched); + break; + case 3: + Assert.assertEquals(130.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(130.0, event.getTouchPoint().getY(), 0.0001); + assertEquals(3, touched); + break; + default: + fail("Wrong touch point id " + event.getTouchPoint().getId()); } }); @@ -405,28 +398,26 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); touched = 0; - rect.setOnTouchPressed(new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(event.getTouchPoint().getId()) { - case 1: - assertEquals(110.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(110.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(1, touched); - break; - case 2: - assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(2, touched); - break; - case 3: - assertEquals(130.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(130.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(3, touched); - break; - default: - fail("Wrong touch point id " + event.getTouchPoint().getId()); - } + rect.setOnTouchPressed(event -> { + touched++; + switch(event.getTouchPoint().getId()) { + case 1: + Assert.assertEquals(110.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(110.0, event.getTouchPoint().getY(), 0.0001); + assertEquals(1, touched); + break; + case 2: + Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); + assertEquals(2, touched); + break; + case 3: + Assert.assertEquals(130.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(130.0, event.getTouchPoint().getY(), 0.0001); + assertEquals(3, touched); + break; + default: + fail("Wrong touch point id " + event.getTouchPoint().getId()); } }); @@ -464,34 +455,32 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); touched = 0; - rect.setOnTouchPressed(new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(event.getTouchPoint().getId()) { - case 1: - assertEquals(110.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(110.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(1, event.getTouchPoints().get(0).getId()); - assertEquals(2, event.getTouchPoints().get(1).getId()); - assertEquals(1, touched); - break; - case 2: - assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(1, event.getTouchPoints().get(0).getId()); - assertEquals(2, event.getTouchPoints().get(1).getId()); - assertEquals(2, touched); - break; - case 3: - assertEquals(130.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(130.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(1, event.getTouchPoints().get(0).getId()); - assertEquals(3, event.getTouchPoints().get(1).getId()); - assertEquals(3, touched); - break; - default: - fail("Wrong touch point id " + event.getTouchPoint().getId()); - } + rect.setOnTouchPressed(event -> { + touched++; + switch(event.getTouchPoint().getId()) { + case 1: + Assert.assertEquals(110.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(110.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(1, event.getTouchPoints().get(0).getId()); + Assert.assertEquals(2, event.getTouchPoints().get(1).getId()); + assertEquals(1, touched); + break; + case 2: + Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(1, event.getTouchPoints().get(0).getId()); + Assert.assertEquals(2, event.getTouchPoints().get(1).getId()); + assertEquals(2, touched); + break; + case 3: + Assert.assertEquals(130.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(130.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(1, event.getTouchPoints().get(0).getId()); + Assert.assertEquals(3, event.getTouchPoints().get(1).getId()); + assertEquals(3, touched); + break; + default: + fail("Wrong touch point id " + event.getTouchPoint().getId()); } }); @@ -529,51 +518,47 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); touched = 0; - rect.setOnTouchPressed(new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(event.getTouchPoint().getId()) { - case 1: - assertEquals(110.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(110.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(1, event.getTouchPoints().get(0).getId()); - assertEquals(2, event.getTouchPoints().get(1).getId()); - assertEquals(1, touched); - break; - case 2: - assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(1, event.getTouchPoints().get(0).getId()); - assertEquals(2, event.getTouchPoints().get(1).getId()); - assertEquals(2, touched); - break; - default: - fail("Wrong touch point id " + event.getTouchPoint().getId()); - } + rect.setOnTouchPressed(event -> { + touched++; + switch(event.getTouchPoint().getId()) { + case 1: + Assert.assertEquals(110.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(110.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(1, event.getTouchPoints().get(0).getId()); + Assert.assertEquals(2, event.getTouchPoints().get(1).getId()); + assertEquals(1, touched); + break; + case 2: + Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(1, event.getTouchPoints().get(0).getId()); + Assert.assertEquals(2, event.getTouchPoints().get(1).getId()); + assertEquals(2, touched); + break; + default: + fail("Wrong touch point id " + event.getTouchPoint().getId()); } }); - rect.setOnTouchMoved(new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(event.getTouchPoint().getId()) { - case 1: - assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(1, event.getTouchPoints().get(0).getId()); - assertEquals(2, event.getTouchPoints().get(1).getId()); - assertEquals(3, touched); - break; - case 2: - assertEquals(110.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(110.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(1, event.getTouchPoints().get(0).getId()); - assertEquals(2, event.getTouchPoints().get(1).getId()); - assertEquals(4, touched); - break; - default: - fail("Wrong touch point id " + event.getTouchPoint().getId()); - } + rect.setOnTouchMoved(event -> { + touched++; + switch(event.getTouchPoint().getId()) { + case 1: + Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(1, event.getTouchPoints().get(0).getId()); + Assert.assertEquals(2, event.getTouchPoints().get(1).getId()); + assertEquals(3, touched); + break; + case 2: + Assert.assertEquals(110.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(110.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(1, event.getTouchPoints().get(0).getId()); + Assert.assertEquals(2, event.getTouchPoints().get(1).getId()); + assertEquals(4, touched); + break; + default: + fail("Wrong touch point id " + event.getTouchPoint().getId()); } }); @@ -603,58 +588,54 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); touched = 0; - rect.setOnTouchPressed(new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(event.getTouchPoint().getId()) { - case 1: - assertEquals(110.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(110.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(1, event.getTouchPoints().get(0).getId()); - assertEquals(2, event.getTouchPoints().get(1).getId()); - assertEquals(1, touched); - break; - case 2: - assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(1, event.getTouchPoints().get(0).getId()); - assertEquals(2, event.getTouchPoints().get(1).getId()); - assertEquals(2, touched); - break; - case 3: - assertEquals(160.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(160.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(2, event.getTouchPoints().get(0).getId()); - assertEquals(3, event.getTouchPoints().get(1).getId()); - assertEquals(3, touched); - break; - default: - fail("Wrong touch point id " + event.getTouchPoint().getId()); - } + rect.setOnTouchPressed(event -> { + touched++; + switch(event.getTouchPoint().getId()) { + case 1: + Assert.assertEquals(110.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(110.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(1, event.getTouchPoints().get(0).getId()); + Assert.assertEquals(2, event.getTouchPoints().get(1).getId()); + assertEquals(1, touched); + break; + case 2: + Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(1, event.getTouchPoints().get(0).getId()); + Assert.assertEquals(2, event.getTouchPoints().get(1).getId()); + assertEquals(2, touched); + break; + case 3: + Assert.assertEquals(160.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(160.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(2, event.getTouchPoints().get(0).getId()); + Assert.assertEquals(3, event.getTouchPoints().get(1).getId()); + assertEquals(3, touched); + break; + default: + fail("Wrong touch point id " + event.getTouchPoint().getId()); } }); - rect.setOnTouchMoved(new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(event.getTouchPoint().getId()) { - case 2: - assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(2, event.getTouchPoints().get(0).getId()); - assertEquals(3, event.getTouchPoints().get(1).getId()); - assertEquals(4, touched); - break; - case 3: - assertEquals(160.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(160.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(2, event.getTouchPoints().get(0).getId()); - assertEquals(3, event.getTouchPoints().get(1).getId()); - assertEquals(5, touched); - break; - default: - fail("Wrong touch point id " + event.getTouchPoint().getId()); - } + rect.setOnTouchMoved(event -> { + touched++; + switch(event.getTouchPoint().getId()) { + case 2: + Assert.assertEquals(120.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(120.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(2, event.getTouchPoints().get(0).getId()); + Assert.assertEquals(3, event.getTouchPoints().get(1).getId()); + assertEquals(4, touched); + break; + case 3: + Assert.assertEquals(160.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(160.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(2, event.getTouchPoints().get(0).getId()); + Assert.assertEquals(3, event.getTouchPoints().get(1).getId()); + assertEquals(5, touched); + break; + default: + fail("Wrong touch point id " + event.getTouchPoint().getId()); } }); @@ -700,33 +681,31 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); touched = 0; - rect.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 1: - case 2: - assertEquals(1, event.getEventSetId()); - assertEquals(touched, event.getTouchPoint().getId()); - break; - case 3: - case 4: - assertEquals(2, event.getEventSetId()); - assertEquals(touched - 2, event.getTouchPoint().getId()); - break; - case 5: - case 6: - assertEquals(1, event.getEventSetId()); - assertEquals(touched - 4, event.getTouchPoint().getId()); - break; - case 7: - case 8: - assertEquals(2, event.getEventSetId()); - assertEquals(touched - 6, event.getTouchPoint().getId()); - break; - default: - fail("Wrong touch point id " + event.getTouchPoint().getId()); - } + rect.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 1: + case 2: + Assert.assertEquals(1, event.getEventSetId()); + Assert.assertEquals(touched, event.getTouchPoint().getId()); + break; + case 3: + case 4: + Assert.assertEquals(2, event.getEventSetId()); + Assert.assertEquals(touched - 2, event.getTouchPoint().getId()); + break; + case 5: + case 6: + Assert.assertEquals(1, event.getEventSetId()); + Assert.assertEquals(touched - 4, event.getTouchPoint().getId()); + break; + case 7: + case 8: + Assert.assertEquals(2, event.getEventSetId()); + Assert.assertEquals(touched - 6, event.getTouchPoint().getId()); + break; + default: + fail("Wrong touch point id " + event.getTouchPoint().getId()); } }); @@ -773,21 +752,19 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); touched = 0; - rect.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 1: - case 3: - assertSame(event.getTouchPoint(), event.getTouchPoints().get(0)); - break; - case 2: - case 4: - assertSame(event.getTouchPoint(), event.getTouchPoints().get(1)); - break; - default: - fail("Wrong touch point id " + event.getTouchPoint().getId()); - } + rect.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 1: + case 3: + assertSame(event.getTouchPoint(), event.getTouchPoints().get(0)); + break; + case 2: + case 4: + assertSame(event.getTouchPoint(), event.getTouchPoints().get(1)); + break; + default: + fail("Wrong touch point id " + event.getTouchPoint().getId()); } }); @@ -821,19 +798,15 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); touched = 0; - rect1.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - assertSame(rect1, event.getTouchPoint().getTarget()); - assertSame(rect2, event.getTouchPoints().get(1).getTarget()); - } + rect1.addEventHandler(TouchEvent.ANY, event -> { + touched++; + assertSame(rect1, event.getTouchPoint().getTarget()); + assertSame(rect2, event.getTouchPoints().get(1).getTarget()); }); - rect2.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - assertSame(rect2, event.getTouchPoint().getTarget()); - assertSame(rect1, event.getTouchPoints().get(0).getTarget()); - } + rect2.addEventHandler(TouchEvent.ANY, event -> { + touched++; + assertSame(rect2, event.getTouchPoint().getTarget()); + assertSame(rect1, event.getTouchPoints().get(0).getTarget()); }); ((StubScene) scene.impl_getPeer()).getListener().touchEventBegin( @@ -863,22 +836,18 @@ rect.setTranslateZ(50); touched = 0; - rect.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - assertEquals(110, event.getTouchPoint().getX(), 0.00001); - assertEquals(110, event.getTouchPoint().getY(), 0.00001); - assertEquals(0, event.getTouchPoint().getZ(), 0.00001); - } + rect.addEventHandler(TouchEvent.ANY, event -> { + touched++; + Assert.assertEquals(110, event.getTouchPoint().getX(), 0.00001); + Assert.assertEquals(110, event.getTouchPoint().getY(), 0.00001); + Assert.assertEquals(0, event.getTouchPoint().getZ(), 0.00001); }); - scene.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - assertEquals(110, event.getTouchPoint().getX(), 0.00001); - assertEquals(110, event.getTouchPoint().getY(), 0.00001); - assertEquals(50, event.getTouchPoint().getZ(), 0.00001); - } + scene.addEventHandler(TouchEvent.ANY, event -> { + touched++; + Assert.assertEquals(110, event.getTouchPoint().getX(), 0.00001); + Assert.assertEquals(110, event.getTouchPoint().getY(), 0.00001); + Assert.assertEquals(50, event.getTouchPoint().getZ(), 0.00001); }); ((StubScene) scene.impl_getPeer()).getListener().touchEventBegin( @@ -913,82 +882,78 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); touched = 0; - rect1.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - assertSame(rect1, event.getTouchPoint().getTarget()); - assertSame(rect2, event.getTouchPoints().get(1).getTarget()); - PickResult res1 = event.getTouchPoint().getPickResult(); - PickResult res2 = event.getTouchPoints().get(1).getPickResult(); - switch(touched) { - case 1: - assertNotNull(res1); - assertSame(rect1, res1.getIntersectedNode()); - assertEquals(110, res1.getIntersectedPoint().getX(), 0.00001); - assertEquals(110, res1.getIntersectedPoint().getY(), 0.00001); - assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); + rect1.addEventHandler(TouchEvent.ANY, event -> { + touched++; + assertSame(rect1, event.getTouchPoint().getTarget()); + assertSame(rect2, event.getTouchPoints().get(1).getTarget()); + PickResult res1 = event.getTouchPoint().getPickResult(); + PickResult res2 = event.getTouchPoints().get(1).getPickResult(); + switch(touched) { + case 1: + assertNotNull(res1); + assertSame(rect1, res1.getIntersectedNode()); + assertEquals(110, res1.getIntersectedPoint().getX(), 0.00001); + assertEquals(110, res1.getIntersectedPoint().getY(), 0.00001); + assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); - assertNotNull(res2); - assertSame(rect2, res2.getIntersectedNode()); - assertEquals(220, res2.getIntersectedPoint().getX(), 0.00001); - assertEquals(220, res2.getIntersectedPoint().getY(), 0.00001); - assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); - break; - case 3: - assertNotNull(res1); - assertSame(rect2, res1.getIntersectedNode()); - assertEquals(220, res1.getIntersectedPoint().getX(), 0.00001); - assertEquals(220, res1.getIntersectedPoint().getY(), 0.00001); - assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); + assertNotNull(res2); + assertSame(rect2, res2.getIntersectedNode()); + assertEquals(220, res2.getIntersectedPoint().getX(), 0.00001); + assertEquals(220, res2.getIntersectedPoint().getY(), 0.00001); + assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); + break; + case 3: + assertNotNull(res1); + assertSame(rect2, res1.getIntersectedNode()); + assertEquals(220, res1.getIntersectedPoint().getX(), 0.00001); + assertEquals(220, res1.getIntersectedPoint().getY(), 0.00001); + assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); - assertNotNull(res2); - assertSame(rect1, res2.getIntersectedNode()); - assertEquals(110, res2.getIntersectedPoint().getX(), 0.00001); - assertEquals(110, res2.getIntersectedPoint().getY(), 0.00001); - assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); - break; - default: - fail("Wrong event delivered"); - } + assertNotNull(res2); + assertSame(rect1, res2.getIntersectedNode()); + assertEquals(110, res2.getIntersectedPoint().getX(), 0.00001); + assertEquals(110, res2.getIntersectedPoint().getY(), 0.00001); + assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); + break; + default: + fail("Wrong event delivered"); } }); - rect2.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - assertSame(rect2, event.getTouchPoint().getTarget()); - assertSame(rect1, event.getTouchPoints().get(0).getTarget()); - PickResult res2 = event.getTouchPoint().getPickResult(); - PickResult res1 = event.getTouchPoints().get(0).getPickResult(); - switch(touched) { - case 2: - assertNotNull(res1); - assertSame(rect1, res1.getIntersectedNode()); - assertEquals(110, res1.getIntersectedPoint().getX(), 0.00001); - assertEquals(110, res1.getIntersectedPoint().getY(), 0.00001); - assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); + rect2.addEventHandler(TouchEvent.ANY, event -> { + touched++; + assertSame(rect2, event.getTouchPoint().getTarget()); + assertSame(rect1, event.getTouchPoints().get(0).getTarget()); + PickResult res2 = event.getTouchPoint().getPickResult(); + PickResult res1 = event.getTouchPoints().get(0).getPickResult(); + switch(touched) { + case 2: + assertNotNull(res1); + assertSame(rect1, res1.getIntersectedNode()); + assertEquals(110, res1.getIntersectedPoint().getX(), 0.00001); + assertEquals(110, res1.getIntersectedPoint().getY(), 0.00001); + assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); - assertNotNull(res2); - assertSame(rect2, res2.getIntersectedNode()); - assertEquals(220, res2.getIntersectedPoint().getX(), 0.00001); - assertEquals(220, res2.getIntersectedPoint().getY(), 0.00001); - assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); - break; - case 4: - assertNotNull(res1); - assertSame(rect2, res1.getIntersectedNode()); - assertEquals(220, res1.getIntersectedPoint().getX(), 0.00001); - assertEquals(220, res1.getIntersectedPoint().getY(), 0.00001); - assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); + assertNotNull(res2); + assertSame(rect2, res2.getIntersectedNode()); + assertEquals(220, res2.getIntersectedPoint().getX(), 0.00001); + assertEquals(220, res2.getIntersectedPoint().getY(), 0.00001); + assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); + break; + case 4: + assertNotNull(res1); + assertSame(rect2, res1.getIntersectedNode()); + assertEquals(220, res1.getIntersectedPoint().getX(), 0.00001); + assertEquals(220, res1.getIntersectedPoint().getY(), 0.00001); + assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); - assertNotNull(res2); - assertSame(rect1, res2.getIntersectedNode()); - assertEquals(110, res2.getIntersectedPoint().getX(), 0.00001); - assertEquals(110, res2.getIntersectedPoint().getY(), 0.00001); - assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); - break; - default: - fail("Wrong event delivered"); - } + assertNotNull(res2); + assertSame(rect1, res2.getIntersectedNode()); + assertEquals(110, res2.getIntersectedPoint().getX(), 0.00001); + assertEquals(110, res2.getIntersectedPoint().getY(), 0.00001); + assertEquals(0, res1.getIntersectedPoint().getZ(), 0.00001); + break; + default: + fail("Wrong event delivered"); } }); @@ -1022,33 +987,29 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); touched = 0; - rect1.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - assertTrue(event.getTouchPoint().belongsTo(rect1)); - assertTrue(event.getTouchPoint().belongsTo(scene.getRoot())); - assertTrue(event.getTouchPoint().belongsTo(scene)); - assertFalse(event.getTouchPoint().belongsTo(rect2)); + rect1.addEventHandler(TouchEvent.ANY, event -> { + touched++; + assertTrue(event.getTouchPoint().belongsTo(rect1)); + assertTrue(event.getTouchPoint().belongsTo(scene.getRoot())); + assertTrue(event.getTouchPoint().belongsTo(scene)); + assertFalse(event.getTouchPoint().belongsTo(rect2)); - assertFalse(event.getTouchPoints().get(1).belongsTo(rect1)); - assertTrue(event.getTouchPoints().get(1).belongsTo(scene.getRoot())); - assertTrue(event.getTouchPoints().get(1).belongsTo(scene)); - assertTrue(event.getTouchPoints().get(1).belongsTo(rect2)); - } + assertFalse(event.getTouchPoints().get(1).belongsTo(rect1)); + assertTrue(event.getTouchPoints().get(1).belongsTo(scene.getRoot())); + assertTrue(event.getTouchPoints().get(1).belongsTo(scene)); + assertTrue(event.getTouchPoints().get(1).belongsTo(rect2)); }); - rect2.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - assertTrue(event.getTouchPoint().belongsTo(rect2)); - assertTrue(event.getTouchPoint().belongsTo(scene.getRoot())); - assertTrue(event.getTouchPoint().belongsTo(scene)); - assertFalse(event.getTouchPoint().belongsTo(rect1)); + rect2.addEventHandler(TouchEvent.ANY, event -> { + touched++; + assertTrue(event.getTouchPoint().belongsTo(rect2)); + assertTrue(event.getTouchPoint().belongsTo(scene.getRoot())); + assertTrue(event.getTouchPoint().belongsTo(scene)); + assertFalse(event.getTouchPoint().belongsTo(rect1)); - assertFalse(event.getTouchPoints().get(0).belongsTo(rect2)); - assertTrue(event.getTouchPoints().get(0).belongsTo(scene.getRoot())); - assertTrue(event.getTouchPoints().get(0).belongsTo(scene)); - assertTrue(event.getTouchPoints().get(0).belongsTo(rect1)); - } + assertFalse(event.getTouchPoints().get(0).belongsTo(rect2)); + assertTrue(event.getTouchPoints().get(0).belongsTo(scene.getRoot())); + assertTrue(event.getTouchPoints().get(0).belongsTo(scene)); + assertTrue(event.getTouchPoints().get(0).belongsTo(rect1)); }); ((StubScene) scene.impl_getPeer()).getListener().touchEventBegin( @@ -1080,59 +1041,55 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); touched = 0; - rect1.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 1: - assertEquals(1, event.getTouchPoint().getId()); - assertEquals(150.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(155.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001); - break; - case 3: - assertEquals(1, event.getTouchPoint().getId()); - assertEquals(250.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(255.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001); - break; - default: - fail("Wrong touch point delivery"); - } + rect1.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 1: + Assert.assertEquals(1, event.getTouchPoint().getId()); + Assert.assertEquals(150.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(155.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001); + break; + case 3: + Assert.assertEquals(1, event.getTouchPoint().getId()); + Assert.assertEquals(250.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(255.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001); + break; + default: + fail("Wrong touch point delivery"); } }); - rect2.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 2: - assertEquals(2, event.getTouchPoint().getId()); - assertEquals(260.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(265.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001); - break; - case 4: - assertEquals(2, event.getTouchPoint().getId()); - assertEquals(160.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(165.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001); - break; - default: - fail("Wrong touch point delivery"); - } + rect2.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 2: + Assert.assertEquals(2, event.getTouchPoint().getId()); + Assert.assertEquals(260.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(265.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001); + break; + case 4: + Assert.assertEquals(2, event.getTouchPoint().getId()); + Assert.assertEquals(160.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(165.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001); + break; + default: + fail("Wrong touch point delivery"); } }); @@ -1165,61 +1122,57 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); touched = 0; - rect1.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 1: - assertEquals(1, event.getTouchPoint().getId()); - assertEquals(150.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(155.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001); - event.getTouchPoint().ungrab(); - break; - case 4: - assertEquals(2, event.getTouchPoint().getId()); - assertEquals(160.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(165.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001); - break; - default: - fail("Wrong touch point delivery"); - } + rect1.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 1: + Assert.assertEquals(1, event.getTouchPoint().getId()); + Assert.assertEquals(150.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(155.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001); + event.getTouchPoint().ungrab(); + break; + case 4: + Assert.assertEquals(2, event.getTouchPoint().getId()); + Assert.assertEquals(160.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(165.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001); + break; + default: + fail("Wrong touch point delivery"); } }); - rect2.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 2: - assertEquals(2, event.getTouchPoint().getId()); - assertEquals(260.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(265.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001); - event.getTouchPoint().ungrab(); - break; - case 3: - assertEquals(1, event.getTouchPoint().getId()); - assertEquals(250.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(255.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001); - break; - default: - fail("Wrong touch point delivery"); - } + rect2.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 2: + Assert.assertEquals(2, event.getTouchPoint().getId()); + Assert.assertEquals(260.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(265.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001); + event.getTouchPoint().ungrab(); + break; + case 3: + Assert.assertEquals(1, event.getTouchPoint().getId()); + Assert.assertEquals(250.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(255.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001); + break; + default: + fail("Wrong touch point delivery"); } }); @@ -1252,60 +1205,56 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); touched = 0; - rect1.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 1: - assertEquals(1, event.getTouchPoint().getId()); - assertEquals(150.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(155.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001); - event.getTouchPoints().get(1).grab(rect1); - break; - case 3: - assertEquals(1, event.getTouchPoint().getId()); - assertEquals(250.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(255.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001); - break; - case 4: - assertEquals(2, event.getTouchPoint().getId()); - assertEquals(160.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(165.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001); - break; - default: - fail("Wrong touch point delivery"); - } + rect1.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 1: + Assert.assertEquals(1, event.getTouchPoint().getId()); + Assert.assertEquals(150.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(155.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001); + event.getTouchPoints().get(1).grab(rect1); + break; + case 3: + Assert.assertEquals(1, event.getTouchPoint().getId()); + Assert.assertEquals(250.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(255.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001); + break; + case 4: + Assert.assertEquals(2, event.getTouchPoint().getId()); + Assert.assertEquals(160.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(165.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001); + break; + default: + fail("Wrong touch point delivery"); } }); - rect2.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 2: - assertEquals(2, event.getTouchPoint().getId()); - assertEquals(260.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(265.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001); - break; - default: - fail("Wrong touch point delivery"); - } + rect2.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 2: + Assert.assertEquals(2, event.getTouchPoint().getId()); + Assert.assertEquals(260.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(265.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001); + break; + default: + fail("Wrong touch point delivery"); } }); @@ -1338,60 +1287,56 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); touched = 0; - rect1.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 1: - assertEquals(1, event.getTouchPoint().getId()); - assertEquals(150.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(155.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001); - event.getTouchPoints().get(1).grab(); - break; - case 3: - assertEquals(1, event.getTouchPoint().getId()); - assertEquals(250.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(255.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001); - break; - case 4: - assertEquals(2, event.getTouchPoint().getId()); - assertEquals(160.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(165.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001); - break; - default: - fail("Wrong touch point delivery"); - } + rect1.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 1: + Assert.assertEquals(1, event.getTouchPoint().getId()); + Assert.assertEquals(150.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(155.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(150.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(155.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1150.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1155.0, event.getTouchPoint().getScreenY(), 0.0001); + event.getTouchPoints().get(1).grab(); + break; + case 3: + Assert.assertEquals(1, event.getTouchPoint().getId()); + Assert.assertEquals(250.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(255.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(250.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(255.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1250.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1255.0, event.getTouchPoint().getScreenY(), 0.0001); + break; + case 4: + Assert.assertEquals(2, event.getTouchPoint().getId()); + Assert.assertEquals(160.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(165.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(160.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(165.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1160.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1165.0, event.getTouchPoint().getScreenY(), 0.0001); + break; + default: + fail("Wrong touch point delivery"); } }); - rect2.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 2: - assertEquals(2, event.getTouchPoint().getId()); - assertEquals(260.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(265.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001); - assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001); - assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001); - break; - default: - fail("Wrong touch point delivery"); - } + rect2.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 2: + Assert.assertEquals(2, event.getTouchPoint().getId()); + Assert.assertEquals(260.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(265.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(260.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(265.0, event.getTouchPoint().getSceneY(), 0.0001); + Assert.assertEquals(1260.0, event.getTouchPoint().getScreenX(), 0.0001); + Assert.assertEquals(1265.0, event.getTouchPoint().getScreenY(), 0.0001); + break; + default: + fail("Wrong touch point delivery"); } }); @@ -1423,32 +1368,30 @@ rect.setTranslateY(5); touched = 0; - rect.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - touched++; - switch(touched) { - case 1: - assertEquals(115.0, event.getTouchPoint().getX(), 0.0001); - assertEquals(125.0, event.getTouchPoint().getY(), 0.0001); - assertEquals(130.0, event.getTouchPoint().getSceneX(), 0.0001); - assertEquals(130.0, event.getTouchPoint().getSceneY(), 0.0001); - break; - case 2: - case 3: - case 4: - case 5: - assertEquals(115.0, event.getTouchPoints().get(0).getX(), 0.0001); - assertEquals(125.0, event.getTouchPoints().get(0).getY(), 0.0001); - assertEquals(130.0, event.getTouchPoints().get(0).getSceneX(), 0.0001); - assertEquals(130.0, event.getTouchPoints().get(0).getSceneY(), 0.0001); - assertEquals(125.0, event.getTouchPoints().get(1).getX(), 0.0001); - assertEquals(135.0, event.getTouchPoints().get(1).getY(), 0.0001); - assertEquals(140.0, event.getTouchPoints().get(1).getSceneX(), 0.0001); - assertEquals(140.0, event.getTouchPoints().get(1).getSceneY(), 0.0001); - break; - default: - fail("Wrong touch point id " + event.getTouchPoint().getId()); - } + rect.addEventHandler(TouchEvent.ANY, event -> { + touched++; + switch(touched) { + case 1: + Assert.assertEquals(115.0, event.getTouchPoint().getX(), 0.0001); + Assert.assertEquals(125.0, event.getTouchPoint().getY(), 0.0001); + Assert.assertEquals(130.0, event.getTouchPoint().getSceneX(), 0.0001); + Assert.assertEquals(130.0, event.getTouchPoint().getSceneY(), 0.0001); + break; + case 2: + case 3: + case 4: + case 5: + Assert.assertEquals(115.0, event.getTouchPoints().get(0).getX(), 0.0001); + Assert.assertEquals(125.0, event.getTouchPoints().get(0).getY(), 0.0001); + Assert.assertEquals(130.0, event.getTouchPoints().get(0).getSceneX(), 0.0001); + Assert.assertEquals(130.0, event.getTouchPoints().get(0).getSceneY(), 0.0001); + Assert.assertEquals(125.0, event.getTouchPoints().get(1).getX(), 0.0001); + Assert.assertEquals(135.0, event.getTouchPoints().get(1).getY(), 0.0001); + Assert.assertEquals(140.0, event.getTouchPoints().get(1).getSceneX(), 0.0001); + Assert.assertEquals(140.0, event.getTouchPoints().get(1).getSceneY(), 0.0001); + break; + default: + fail("Wrong touch point id " + event.getTouchPoint().getId()); } }); @@ -1484,11 +1427,7 @@ Rectangle rect = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); - rect.addEventHandler(TouchEvent.ANY, new EventHandler() { - @Override public void handle(TouchEvent event) { - fail("Delivered indirect touch event"); - } - }); + rect.addEventHandler(TouchEvent.ANY, event -> fail("Delivered indirect touch event")); ((StubScene) scene.impl_getPeer()).getListener().touchEventBegin( System.currentTimeMillis(), 1, false, true, false, true, false); diff --git a/modules/graphics/src/test/java/javafx/scene/input/ZoomEventTest.java b/modules/graphics/src/test/java/javafx/scene/input/ZoomEventTest.java --- a/modules/graphics/src/test/java/javafx/scene/input/ZoomEventTest.java +++ b/modules/graphics/src/test/java/javafx/scene/input/ZoomEventTest.java @@ -34,6 +34,7 @@ import javafx.scene.Scene; import javafx.scene.shape.Rectangle; import javafx.stage.Stage; +import org.junit.Assert; import org.junit.Test; import static org.junit.Assert.*; @@ -188,10 +189,8 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); zoomed = false; - rect.setOnZoom(new EventHandler() { - @Override public void handle(ZoomEvent event) { - zoomed = true; - } + rect.setOnZoom(event -> { + zoomed = true; }); ((StubScene) scene.impl_getPeer()).getListener().zoomEvent( @@ -214,12 +213,10 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); zoomed = false; - rect.setOnZoom(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertEquals(1.2, event.getZoomFactor(), 0.0001); - assertEquals(2.4, event.getTotalZoomFactor(), 0.0001); - zoomed = true; - } + rect.setOnZoom(event -> { + Assert.assertEquals(1.2, event.getZoomFactor(), 0.0001); + Assert.assertEquals(2.4, event.getTotalZoomFactor(), 0.0001); + zoomed = true; }); ((StubScene) scene.impl_getPeer()).getListener().zoomEvent( @@ -236,14 +233,12 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); zoomed = false; - rect.setOnZoom(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertTrue(event.isShiftDown()); - assertFalse(event.isControlDown()); - assertTrue(event.isAltDown()); - assertFalse(event.isMetaDown()); - zoomed = true; - } + rect.setOnZoom(event -> { + assertTrue(event.isShiftDown()); + assertFalse(event.isControlDown()); + assertTrue(event.isAltDown()); + assertFalse(event.isMetaDown()); + zoomed = true; }); ((StubScene) scene.impl_getPeer()).getListener().zoomEvent( ZoomEvent.ZOOM, 2, 3, @@ -251,14 +246,12 @@ assertTrue(zoomed); zoomed = false; - rect.setOnZoom(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertFalse(event.isShiftDown()); - assertTrue(event.isControlDown()); - assertFalse(event.isAltDown()); - assertTrue(event.isMetaDown()); - zoomed = true; - } + rect.setOnZoom(event -> { + assertFalse(event.isShiftDown()); + assertTrue(event.isControlDown()); + assertFalse(event.isAltDown()); + assertTrue(event.isMetaDown()); + zoomed = true; }); ((StubScene) scene.impl_getPeer()).getListener().zoomEvent( ZoomEvent.ZOOM, 2, 3, @@ -273,11 +266,9 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); zoomed = false; - rect.setOnZoom(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertTrue(event.isDirect()); - zoomed = true; - } + rect.setOnZoom(event -> { + assertTrue(event.isDirect()); + zoomed = true; }); ((StubScene) scene.impl_getPeer()).getListener().zoomEvent( ZoomEvent.ZOOM, 2, 3, @@ -285,11 +276,9 @@ assertTrue(zoomed); zoomed = false; - rect.setOnZoom(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertFalse(event.isDirect()); - zoomed = true; - } + rect.setOnZoom(event -> { + assertFalse(event.isDirect()); + zoomed = true; }); ((StubScene) scene.impl_getPeer()).getListener().zoomEvent( ZoomEvent.ZOOM, 2, 3, @@ -304,11 +293,9 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); zoomed = false; - rect.setOnZoom(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertTrue(event.isInertia()); - zoomed = true; - } + rect.setOnZoom(event -> { + assertTrue(event.isInertia()); + zoomed = true; }); ((StubScene) scene.impl_getPeer()).getListener().zoomEvent( ZoomEvent.ZOOM, 2, 3, @@ -316,11 +303,9 @@ assertTrue(zoomed); zoomed = false; - rect.setOnZoom(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertFalse(event.isInertia()); - zoomed = true; - } + rect.setOnZoom(event -> { + assertFalse(event.isInertia()); + zoomed = true; }); ((StubScene) scene.impl_getPeer()).getListener().zoomEvent( ZoomEvent.ZOOM, 2, 3, @@ -335,10 +320,8 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); zoomed = false; - rect.setOnZoomStarted(new EventHandler() { - @Override public void handle(ZoomEvent event) { - zoomed = true; - } + rect.setOnZoomStarted(event -> { + zoomed = true; }); ((StubScene) scene.impl_getPeer()).getListener().zoomEvent( ZoomEvent.ZOOM_STARTED, 2, 3, @@ -346,10 +329,8 @@ assertTrue(zoomed); zoomed = false; - rect.setOnZoomFinished(new EventHandler() { - @Override public void handle(ZoomEvent event) { - zoomed = true; - } + rect.setOnZoomFinished(event -> { + zoomed = true; }); ((StubScene) scene.impl_getPeer()).getListener().zoomEvent( ZoomEvent.ZOOM_FINISHED, 2, 3, @@ -363,10 +344,8 @@ Rectangle rect = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); - rect.addEventHandler(ZoomEvent.ANY, new EventHandler() { - @Override public void handle(ZoomEvent event) { - zoomed = true; - } + rect.addEventHandler(ZoomEvent.ANY, event -> { + zoomed = true; }); zoomed = false; @@ -396,15 +375,11 @@ Rectangle rect2 = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); - rect1.addEventHandler(ZoomEvent.ANY, new EventHandler() { - @Override public void handle(ZoomEvent event) { - zoomed = true; - } + rect1.addEventHandler(ZoomEvent.ANY, event -> { + zoomed = true; }); - rect2.addEventHandler(ZoomEvent.ANY, new EventHandler() { - @Override public void handle(ZoomEvent event) { - zoomed2 = true; - } + rect2.addEventHandler(ZoomEvent.ANY, event -> { + zoomed2 = true; }); zoomed = false; @@ -441,22 +416,18 @@ zoomed = false; zoomed2 = false; - rect.setOnZoom(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertEquals(150, event.getX(), 0.00001); - assertEquals(150, event.getY(), 0.00001); - assertEquals(0, event.getZ(), 0.00001); - zoomed = true; - } + rect.setOnZoom(event -> { + Assert.assertEquals(150, event.getX(), 0.00001); + Assert.assertEquals(150, event.getY(), 0.00001); + Assert.assertEquals(0, event.getZ(), 0.00001); + zoomed = true; }); - scene.setOnZoom(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertEquals(150, event.getX(), 0.00001); - assertEquals(150, event.getY(), 0.00001); - assertEquals(50, event.getZ(), 0.00001); - zoomed2 = true; - } + scene.setOnZoom(event -> { + Assert.assertEquals(150, event.getX(), 0.00001); + Assert.assertEquals(150, event.getY(), 0.00001); + Assert.assertEquals(50, event.getZ(), 0.00001); + zoomed2 = true; }); ((StubScene) scene.impl_getPeer()).getListener().zoomEvent( @@ -475,17 +446,13 @@ Rectangle rect2 = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); - rect1.addEventHandler(ZoomEvent.ANY, new EventHandler() { - @Override public void handle(ZoomEvent event) { - zoomed = true; - pickRes = event.getPickResult(); - } + rect1.addEventHandler(ZoomEvent.ANY, event -> { + zoomed = true; + pickRes = event.getPickResult(); }); - rect2.addEventHandler(ZoomEvent.ANY, new EventHandler() { - @Override public void handle(ZoomEvent event) { - zoomed2 = true; - pickRes = event.getPickResult(); - } + rect2.addEventHandler(ZoomEvent.ANY, event -> { + zoomed2 = true; + pickRes = event.getPickResult(); }); zoomed = false; @@ -538,22 +505,18 @@ (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); Rectangle rect2 = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(1); - rect1.addEventHandler(ZoomEvent.ANY, new EventHandler() { - @Override public void handle(ZoomEvent event) { - zoomed = true; - } + rect1.addEventHandler(ZoomEvent.ANY, event -> { + zoomed = true; }); MouseEventGenerator generator = new MouseEventGenerator(); zoomed = false; zoomed2 = false; - rect2.setOnZoomStarted(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertEquals(250.0, event.getSceneX(), 0.0001); - assertEquals(250.0, event.getSceneY(), 0.0001); - zoomed2 = true; - } + rect2.setOnZoomStarted(event -> { + Assert.assertEquals(250.0, event.getSceneX(), 0.0001); + Assert.assertEquals(250.0, event.getSceneY(), 0.0001); + zoomed2 = true; }); scene.impl_processMouseEvent(generator.generateMouseEvent( MouseEvent.MOUSE_MOVED, 250, 250)); @@ -566,12 +529,10 @@ zoomed = false; zoomed2 = false; - rect2.setOnZoom(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertEquals(150.0, event.getSceneX(), 0.0001); - assertEquals(150.0, event.getSceneY(), 0.0001); - zoomed2 = true; - } + rect2.setOnZoom(event -> { + Assert.assertEquals(150.0, event.getSceneX(), 0.0001); + Assert.assertEquals(150.0, event.getSceneY(), 0.0001); + zoomed2 = true; }); scene.impl_processMouseEvent(generator.generateMouseEvent( MouseEvent.MOUSE_MOVED, 150, 150)); @@ -584,12 +545,10 @@ zoomed = false; zoomed2 = false; - rect2.setOnZoomFinished(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertEquals(150.0, event.getSceneX(), 0.0001); - assertEquals(150.0, event.getSceneY(), 0.0001); - zoomed2 = true; - } + rect2.setOnZoomFinished(event -> { + Assert.assertEquals(150.0, event.getSceneX(), 0.0001); + Assert.assertEquals(150.0, event.getSceneY(), 0.0001); + zoomed2 = true; }); ((StubScene) scene.impl_getPeer()).getListener().zoomEvent( ZoomEvent.ZOOM_FINISHED, 2, 3, @@ -604,12 +563,10 @@ Scene scene = createScene(); Rectangle rect = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); - rect.setOnZoomFinished(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertEquals(250.0, event.getSceneX(), 0.0001); - assertEquals(250.0, event.getSceneY(), 0.0001); - zoomed = true; - } + rect.setOnZoomFinished(event -> { + Assert.assertEquals(250.0, event.getSceneX(), 0.0001); + Assert.assertEquals(250.0, event.getSceneY(), 0.0001); + zoomed = true; }); zoomed = false; @@ -639,12 +596,10 @@ Rectangle rect = (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0); - rect.setOnZoom(new EventHandler() { - @Override public void handle(ZoomEvent event) { - assertEquals(150.0, event.getSceneX(), 0.0001); - assertEquals(150.0, event.getSceneY(), 0.0001); - zoomed = true; - } + rect.setOnZoom(event -> { + Assert.assertEquals(150.0, event.getSceneX(), 0.0001); + Assert.assertEquals(150.0, event.getSceneY(), 0.0001); + zoomed = true; }); zoomed = false; diff --git a/modules/graphics/src/test/java/javafx/scene/shape/ShapeTest.java b/modules/graphics/src/test/java/javafx/scene/shape/ShapeTest.java --- a/modules/graphics/src/test/java/javafx/scene/shape/ShapeTest.java +++ b/modules/graphics/src/test/java/javafx/scene/shape/ShapeTest.java @@ -120,14 +120,10 @@ assertNotNull(actual); assertTrue(actual.isEmpty()); - actual.addListener(new ListChangeListener(){ - - @Override - public void onChanged(Change c) { - listChangeCalled = true; - assertTrue(c.next()); - assertEquals(expected, c.getAddedSubList()); - } + actual.addListener((ListChangeListener) c -> { + listChangeCalled = true; + assertTrue(c.next()); + Assert.assertEquals(expected, c.getAddedSubList()); }); shape.getStrokeDashArray().addAll(expected); @@ -210,10 +206,8 @@ Shape shape = new StubShape(); - Runnable listener = new Runnable() { - public void run() { - listenerCalled = true; - } + Runnable listener = () -> { + listenerCalled = true; }; shape.impl_setShapeChangeListener(listener); diff --git a/modules/graphics/src/test/java/javafx/scene/transform/AffineOperationsTest.java b/modules/graphics/src/test/java/javafx/scene/transform/AffineOperationsTest.java --- a/modules/graphics/src/test/java/javafx/scene/transform/AffineOperationsTest.java +++ b/modules/graphics/src/test/java/javafx/scene/transform/AffineOperationsTest.java @@ -210,25 +210,19 @@ private void testOperationIsAtomic(Affine a, final Runnable op, final Runnable check) { - a.setOnTransformChanged(new EventHandler() { - @Override public void handle(TransformChangedEvent event) { - eventCounter++; - check.run(); - } + a.setOnTransformChanged(event -> { + eventCounter++; + check.run(); }); - a.myxProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable observable) { - listener1Counter++; - check.run(); - } + a.myxProperty().addListener(observable -> { + listener1Counter++; + check.run(); }); - a.tyProperty().addListener(new InvalidationListener() { - @Override public void invalidated(Observable observable) { - listener2Counter++; - check.run(); - } + a.tyProperty().addListener(observable -> { + listener2Counter++; + check.run(); }); memMyx = a.getMyx(); @@ -250,15 +244,9 @@ final Shear sh = new Shear(12, 15); testOperationIsAtomic(a, - new Runnable() { - @Override public void run() { - a.setToTransform(sh); - }}, - new Runnable() { - @Override public void run() { - assertAffineOk(sh, a); - } - }); + () -> a.setToTransform(sh), + () -> assertAffineOk(sh, a) + ); } @Test @@ -267,15 +255,9 @@ final Shear sh = new Shear(12, 15); testOperationIsAtomic(a, - new Runnable() { - @Override public void run() { - a.setToTransform(1, 12, 0, 15, 1, 0); - }}, - new Runnable() { - @Override public void run() { - assertAffineOk(sh, a); - } - }); + () -> a.setToTransform(1, 12, 0, 15, 1, 0), + () -> assertAffineOk(sh, a) + ); } @Test @@ -290,15 +272,9 @@ final Affine a = affine.clone(); testOperationIsAtomic(a, - new Runnable() { - @Override public void run() { - a.setToIdentity(); - }}, - new Runnable() { - @Override public void run() { - assertAffineOk(new Affine(), a); - } - }); + () -> a.setToIdentity(), + () -> assertAffineOk(new Affine(), a) + ); } @Test @@ -389,11 +365,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Translate(8, 9)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendTranslation(8, 9); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendTranslation(8, 9), () -> assertAffineOk(res, a)); } @Test @@ -423,11 +395,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(new Translate(8, 9), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prependTranslation(8, 9); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prependTranslation(8, 9), () -> assertAffineOk(res, a)); } @Test @@ -446,11 +414,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Translate(8, 9, 10)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendTranslation(8, 9, 10); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendTranslation(8, 9, 10), () -> assertAffineOk(res, a)); } @Test @@ -480,11 +444,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(new Translate(8, 9, 10), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prependTranslation(8, 9, 10); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prependTranslation(8, 9, 10), () -> assertAffineOk(res, a)); } @Test @@ -595,11 +555,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Scale(8, 9)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendScale(8, 9); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendScale(8, 9), () -> assertAffineOk(res, a)); } @Test @@ -738,11 +694,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(new Scale(8, 9), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prependScale(8, 9); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prependScale(8, 9), () -> assertAffineOk(res, a)); } @Test @@ -772,11 +724,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Scale(8, 9, 10, 11)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendScale(8, 9, 10, 11); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendScale(8, 9, 10, 11), () -> assertAffineOk(res, a)); } @Test @@ -806,11 +754,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(new Scale(8, 9, 10, 11), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prependScale(8, 9, 10, 11); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prependScale(8, 9, 10, 11), () -> assertAffineOk(res, a)); } @Test @@ -882,11 +826,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Scale(8, 9, 10)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendScale(8, 9, 10); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendScale(8, 9, 10), () -> assertAffineOk(res, a)); } @Test @@ -929,11 +869,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(new Scale(8, 9, 10), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prependScale(8, 9, 10); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prependScale(8, 9, 10), () -> assertAffineOk(res, a)); } @Test @@ -963,11 +899,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Scale(8, 9, 10, 11, 12, 13)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendScale(8, 9, 10, 11, 12, 13); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendScale(8, 9, 10, 11, 12, 13), () -> assertAffineOk(res, a)); } @Test @@ -997,11 +929,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(new Scale(8, 9, 10, 11, 12, 13), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prependScale(8, 9, 10, 11, 12, 13); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prependScale(8, 9, 10, 11, 12, 13), () -> assertAffineOk(res, a)); } @Test @@ -1083,11 +1011,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Shear(8, 9)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendShear(8, 9); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendShear(8, 9), () -> assertAffineOk(res, a)); } @Test @@ -1131,11 +1055,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(new Shear(8, 9), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prependShear(8, 9); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prependShear(8, 9), () -> assertAffineOk(res, a)); } @Test @@ -1165,11 +1085,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Shear(8, 9, 10, 11)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendShear(8, 9, 10, 11); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendShear(8, 9, 10, 11), () -> assertAffineOk(res, a)); } @Test @@ -1199,11 +1115,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(new Shear(8, 9, 10, 11), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prependShear(8, 9, 10, 11); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prependShear(8, 9, 10, 11), () -> assertAffineOk(res, a)); } @Test @@ -1222,11 +1134,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Rotate(37)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendRotation(37); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendRotation(37), () -> assertAffineOk(res, a)); } @Test @@ -1245,11 +1153,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(new Rotate(37), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prependRotation(37); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prependRotation(37), () -> assertAffineOk(res, a)); } @Test @@ -1268,11 +1172,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Rotate(90)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendRotation(90); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendRotation(90), () -> assertAffineOk(res, a)); } @Test @@ -1291,11 +1191,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Rotate(90)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendRotation(90); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendRotation(90), () -> assertAffineOk(res, a)); } @Test @@ -1314,11 +1210,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Rotate(180)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendRotation(180); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendRotation(180), () -> assertAffineOk(res, a)); } @Test @@ -1337,11 +1229,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Rotate(180)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendRotation(180); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendRotation(180), () -> assertAffineOk(res, a)); } @Test @@ -1360,11 +1248,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Rotate(270)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendRotation(270); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendRotation(270), () -> assertAffineOk(res, a)); } @Test @@ -1383,11 +1267,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Rotate(270)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendRotation(270); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendRotation(270), () -> assertAffineOk(res, a)); } @Test @@ -1472,11 +1352,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(a, new Rotate(37, 10, 11)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendRotation(37, 10, 11); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendRotation(37, 10, 11), () -> assertAffineOk(res, a)); } @Test @@ -1527,11 +1403,7 @@ final Affine a = affine.clone(); final Transform res = TransformHelper.concatenate(new Rotate(37, 10, 11), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prependRotation(37, 10, 11); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prependRotation(37, 10, 11), () -> assertAffineOk(res, a)); } @Test @@ -1668,11 +1540,7 @@ final Transform res = TransformHelper.concatenate(a, new Rotate(37, 8, 9, 10, new Point3D(12, 123, 521))); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.appendRotation(37, 8, 9, 10, 12, 123, 521); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.appendRotation(37, 8, 9, 10, 12, 123, 521), () -> assertAffineOk(res, a)); } @Test @@ -1773,11 +1641,7 @@ final Transform res = TransformHelper.concatenate( new Rotate(37, 8, 9, 10, new Point3D(12, 123, 521)), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prependRotation(37, 8, 9, 10, 12, 123, 521); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prependRotation(37, 8, 9, 10, 12, 123, 521), () -> assertAffineOk(res, a)); } @Test @@ -1802,12 +1666,8 @@ new Affine(20, 22, 24, 28, 30, 32)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.append(20, 22, 24, - 28, 30, 32); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.append(20, 22, 24, + 28, 30, 32), () -> assertAffineOk(res, a)); } @Test @@ -1832,12 +1692,8 @@ new Affine(20, 22, 24, 28, 30, 32), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prepend(20, 22, 24, - 28, 30, 32); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prepend(20, 22, 24, + 28, 30, 32), () -> assertAffineOk(res, a)); } @Test @@ -1865,13 +1721,9 @@ 28, 30, 32, 34, 36, 38, 40, 42)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.append(20, 22, 24, 26, - 28, 30, 32, 34, - 36, 38, 40, 42); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.append(20, 22, 24, 26, + 28, 30, 32, 34, + 36, 38, 40, 42), () -> assertAffineOk(res, a)); } @Test @@ -1899,13 +1751,9 @@ 28, 30, 32, 34, 36, 38, 40, 42), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prepend(20, 22, 24, 26, - 28, 30, 32, 34, - 36, 38, 40, 42); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prepend(20, 22, 24, 26, + 28, 30, 32, 34, + 36, 38, 40, 42), () -> assertAffineOk(res, a)); } @Test @@ -1938,14 +1786,10 @@ 28, 30, 32, 34, 36, 38, 40, 42)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.append(new Affine( - 20, 22, 24, 26, - 28, 30, 32, 34, - 36, 38, 40, 42)); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.append(new Affine( + 20, 22, 24, 26, + 28, 30, 32, 34, + 36, 38, 40, 42)), () -> assertAffineOk(res, a)); } @Test @@ -1980,14 +1824,10 @@ 28, 30, 32, 34, 36, 38, 40, 42), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prepend(new Affine( - 20, 22, 24, 26, - 28, 30, 32, 34, - 36, 38, 40, 42)); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prepend(new Affine( + 20, 22, 24, 26, + 28, 30, 32, 34, + 36, 38, 40, 42)), () -> assertAffineOk(res, a)); } @Test @@ -2046,11 +1886,7 @@ 6, 7, 0, 8, 0, 0, 1, 0)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.append(array2d, MatrixType.MT_2D_2x3, 2); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.append(array2d, MatrixType.MT_2D_2x3, 2), () -> assertAffineOk(res, a)); } @Test @@ -2061,11 +1897,7 @@ 6, 7, 0, 8, 0, 0, 1, 0)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.append(array2d, MatrixType.MT_2D_3x3, 2); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.append(array2d, MatrixType.MT_2D_3x3, 2), () -> assertAffineOk(res, a)); } @Test @@ -2076,11 +1908,7 @@ 6, 7, 8, 9, 10, 11, 12, 13)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.append(array3d, MatrixType.MT_3D_3x4, 2); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.append(array3d, MatrixType.MT_3D_3x4, 2), () -> assertAffineOk(res, a)); } @Test @@ -2091,11 +1919,7 @@ 6, 7, 8, 9, 10, 11, 12, 13)); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.append(array3d, MatrixType.MT_3D_4x4, 2); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.append(array3d, MatrixType.MT_3D_4x4, 2), () -> assertAffineOk(res, a)); } @Test(expected=IndexOutOfBoundsException.class) @@ -2275,11 +2099,7 @@ 6, 7, 0, 8, 0, 0, 1, 0), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prepend(array2d, MatrixType.MT_2D_2x3, 2); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prepend(array2d, MatrixType.MT_2D_2x3, 2), () -> assertAffineOk(res, a)); } @Test @@ -2290,11 +2110,7 @@ 6, 7, 0, 8, 0, 0, 1, 0), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prepend(array2d, MatrixType.MT_2D_3x3, 2); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prepend(array2d, MatrixType.MT_2D_3x3, 2), () -> assertAffineOk(res, a)); } @Test @@ -2305,11 +2121,7 @@ 6, 7, 8, 9, 10, 11, 12, 13), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prepend(array3d, MatrixType.MT_3D_3x4, 2); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prepend(array3d, MatrixType.MT_3D_3x4, 2), () -> assertAffineOk(res, a)); } @Test @@ -2320,11 +2132,7 @@ 6, 7, 8, 9, 10, 11, 12, 13), a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { - a.prepend(array3d, MatrixType.MT_3D_4x4, 2); - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + testOperationIsAtomic(a, () -> a.prepend(array3d, MatrixType.MT_3D_4x4, 2), () -> assertAffineOk(res, a)); } @Test(expected=IndexOutOfBoundsException.class) @@ -2485,15 +2293,13 @@ try { final Transform res = TransformHelper.invert(a); - testOperationIsAtomic(a, new Runnable() { @Override public void run() { + testOperationIsAtomic(a, () -> { try { a.invert(); } catch (NonInvertibleTransformException e) { fail("Should be invertible"); } - }}, new Runnable() { @Override public void run() { - assertAffineOk(res, a); - }}); + }, () -> assertAffineOk(res, a)); } catch (NonInvertibleTransformException e) { try { a.invert(); diff --git a/modules/graphics/src/test/java/javafx/scene/transform/AffineTest.java b/modules/graphics/src/test/java/javafx/scene/transform/AffineTest.java --- a/modules/graphics/src/test/java/javafx/scene/transform/AffineTest.java +++ b/modules/graphics/src/test/java/javafx/scene/transform/AffineTest.java @@ -495,20 +495,14 @@ public void testRepeatedAtomicChangeNotifications() { final Affine a = new Affine(); - a.mxxProperty().addListener(new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - a.getMxx(); - listenerCounter++; - } + a.mxxProperty().addListener(observable -> { + a.getMxx(); + listenerCounter++; }); - a.tyProperty().addListener(new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - a.getTy(); - listenerCounter++; - } + a.tyProperty().addListener(observable -> { + a.getTy(); + listenerCounter++; }); listenerCounter = 0; @@ -537,12 +531,9 @@ public void atomicChangeBackAndForthShouldNotNotify() { final Affine a = new Affine(); - a.txProperty().addListener(new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - a.getTx(); - listenerCounter++; - } + a.txProperty().addListener(observable -> { + a.getTx(); + listenerCounter++; }); listenerCounter = 0; @@ -555,14 +546,9 @@ public void recursiveAtomicChangeShouldBeFine() { final Affine a = new Affine(); - a.tyProperty().addListener(new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - a.setToTransform( 3, 4, 5, 6, - 7, 8, 10, 9, - 11, 12, 13, 14); - } - }); + a.tyProperty().addListener(observable -> a.setToTransform( 3, 4, 5, 6, + 7, 8, 10, 9, + 11, 12, 13, 14)); listenerCounter = 0; a.setToTransform( 2, 3, 4, 5, diff --git a/modules/graphics/src/test/java/javafx/scene/transform/TransformChangedEventTest.java b/modules/graphics/src/test/java/javafx/scene/transform/TransformChangedEventTest.java --- a/modules/graphics/src/test/java/javafx/scene/transform/TransformChangedEventTest.java +++ b/modules/graphics/src/test/java/javafx/scene/transform/TransformChangedEventTest.java @@ -47,18 +47,8 @@ @Test public void testConstructor() { - final EventTarget src = new EventTarget() { - @Override - public EventDispatchChain buildEventDispatchChain(EventDispatchChain tail) { - return null; - } - }; - final EventTarget trg = new EventTarget() { - @Override - public EventDispatchChain buildEventDispatchChain(EventDispatchChain tail) { - return null; - } - }; + final EventTarget src = tail -> null; + final EventTarget trg = tail -> null; TransformChangedEvent e = new TransformChangedEvent(src, trg); assertSame(TransformChangedEvent.TRANSFORM_CHANGED, e.getEventType()); assertSame(src, e.getSource()); diff --git a/modules/graphics/src/test/java/javafx/scene/transform/TransformOperationsTest.java b/modules/graphics/src/test/java/javafx/scene/transform/TransformOperationsTest.java --- a/modules/graphics/src/test/java/javafx/scene/transform/TransformOperationsTest.java +++ b/modules/graphics/src/test/java/javafx/scene/transform/TransformOperationsTest.java @@ -1541,16 +1541,14 @@ final Transform clone = t.clone(); InvalidationListener l = - new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - if (is2d) { - assertFalse(clone.type2DProperty().get()); - } else { - assertTrue(clone.type2DProperty().get()); - } - listenerCalled = true; - } - }; + valueModel -> { + if (is2d) { + assertFalse(clone.type2DProperty().get()); + } else { + assertTrue(clone.type2DProperty().get()); + } + listenerCalled = true; + }; clone.type2DProperty().addListener(l); @@ -1583,10 +1581,7 @@ final Transform clone = t.clone(); ChangeListener l = - new ChangeListener() { - @Override public void changed( - ObservableValue observable, - Boolean oldValue, Boolean newValue) { + (observable, oldValue, newValue) -> { if ((is2d && (eventCounter == 0 || eventCounter == 2)) || (!is2d && eventCounter == 1)) { @@ -1601,8 +1596,7 @@ listenerCalled = true; eventCounter++; - } - }; + }; clone.type2DProperty().addListener(l); @@ -1691,19 +1685,17 @@ final Transform clone = t.clone(); InvalidationListener l = - new InvalidationListener() { - @Override public void invalidated(Observable valueModel) { - if (isIdentity) { - if (!clone.identityProperty().get()) { - listenerCalled = true; - } - } else { - if (clone.identityProperty().get()) { - listenerCalled = true; - } + valueModel -> { + if (isIdentity) { + if (!clone.identityProperty().get()) { + listenerCalled = true; } - } - }; + } else { + if (clone.identityProperty().get()) { + listenerCalled = true; + } + } + }; clone.identityProperty().addListener(l); @@ -1738,10 +1730,7 @@ final Transform clone = t.clone(); ChangeListener l = - new ChangeListener() { - @Override public void changed( - ObservableValue observable, - Boolean oldValue, Boolean newValue) { + (observable, oldValue, newValue) -> { if (isIdentity) { if (oldValue == true && newValue == false && clone.identityProperty().get() == false) { @@ -1754,8 +1743,7 @@ } } - } - }; + }; clone.identityProperty().addListener(l); @@ -2465,11 +2453,9 @@ Transform clone = t.clone(); EventHandler ontc = - new EventHandler() { - @Override public void handle(TransformChangedEvent event) { + event -> { eventCounter++; - } - }; + }; assertSame(null, clone.getOnTransformChanged()); clone.setOnTransformChanged(ontc); @@ -2502,18 +2488,14 @@ Transform clone = t.clone(); EventHandler counting = - new EventHandler() { - @Override public void handle(TransformChangedEvent event) { + event -> { eventCounter++; - } - }; + }; EventHandler checking = - new EventHandler() { - @Override public void handle(TransformChangedEvent event) { + event -> { listenerCalled = true; - } - }; + }; clone.addEventHandler(TransformChangedEvent.TRANSFORM_CHANGED, counting); clone.addEventHandler(TransformChangedEvent.TRANSFORM_CHANGED, checking); @@ -2548,19 +2530,15 @@ Transform clone = t.clone(); EventHandler counting = - new EventHandler() { - @Override public void handle(TransformChangedEvent event) { + event -> { eventCounter++; event.consume(); - } - }; + }; EventHandler checking = - new EventHandler() { - @Override public void handle(TransformChangedEvent event) { + event -> { listenerCalled = true; - } - }; + }; clone.addEventFilter(TransformChangedEvent.TRANSFORM_CHANGED, counting); clone.addEventHandler(TransformChangedEvent.TRANSFORM_CHANGED, checking); diff --git a/modules/graphics/src/test/java/javafx/stage/PopupTest.java b/modules/graphics/src/test/java/javafx/stage/PopupTest.java --- a/modules/graphics/src/test/java/javafx/stage/PopupTest.java +++ b/modules/graphics/src/test/java/javafx/stage/PopupTest.java @@ -366,10 +366,8 @@ Popup p1 = new Popup(); p1.setAutoHide(true); p1.show(stage); - p1.setOnAutoHide(new EventHandler() { - @Override public void handle(Event e) { - done = true; - } + p1.setOnAutoHide(e -> { + done = true; }); Rectangle rect = new Rectangle(20, 20, 50, 50); p1.getContent().add(rect);