() {
- @Override
- public void handle(ActionEvent event) {
- // Only use the bold button for paragraphs. We don't
- // want to turn bold off for headings.
+ boldButton.setOnAction(event1 -> {
+ // Only use the bold button for paragraphs. We don't
+ // want to turn bold off for headings.
- if ("".equals(formatStyleMap.get(formatComboBox.getValue()))) {
- executeCommand(BOLD_COMMAND, boldButton.selectedProperty().getValue().toString());
- }
+ if ("
".equals(formatStyleMap.get(formatComboBox.getValue()))) {
+ executeCommand(BOLD_COMMAND, boldButton.selectedProperty().getValue().toString());
}
});
italicButton = addToggleButton(toolbar2, null,
@@ -744,13 +696,10 @@
insertHorizontalRuleButton = addButton(toolbar2, resources.getString("insertHorizontalRuleIcon"),
resources.getString("insertHorizontalRule"), INSERT_HORIZONTAL_RULE_COMMAND, "html-editor-hr");
// We override setOnAction to insert a new line. This fixes RT-16453
- insertHorizontalRuleButton.setOnAction(new EventHandler() {
- @Override
- public void handle(ActionEvent event) {
- executeCommand(INSERT_NEW_LINE_COMMAND, null);
- executeCommand(INSERT_HORIZONTAL_RULE_COMMAND, null);
- updateToolbarState(false);
- }
+ insertHorizontalRuleButton.setOnAction(event -> {
+ executeCommand(INSERT_NEW_LINE_COMMAND, null);
+ executeCommand(INSERT_HORIZONTAL_RULE_COMMAND, null);
+ updateToolbarState(false);
});
fgColorButton = new ColorPicker();
@@ -760,22 +709,16 @@
fgColorButton.impl_processCSS(true);
ColorPickerSkin fgColorPickerSkin = (ColorPickerSkin) fgColorButton.getSkin();
- String fgIcon = AccessController.doPrivileged(new PrivilegedAction() {
- @Override public String run() {
- return HTMLEditorSkin.class.getResource(resources.getString("foregroundColorIcon")).toString();
- }
- });
+ String fgIcon = AccessController.doPrivileged((PrivilegedAction) () -> HTMLEditorSkin.class.getResource(resources.getString("foregroundColorIcon")).toString());
((StyleableProperty)fgColorPickerSkin.imageUrlProperty()).applyStyle(null,fgIcon);
fgColorButton.setValue(DEFAULT_FG_COLOR);
fgColorButton.setTooltip(new Tooltip(resources.getString("foregroundColor")));
- fgColorButton.setOnAction(new EventHandler() {
- @Override public void handle(ActionEvent ev) {
- Color newValue = fgColorButton.getValue();
- if (newValue != null) {
- executeCommand(FOREGROUND_COLOR_COMMAND, colorValueToHex(newValue));
- fgColorButton.hide();
- }
+ fgColorButton.setOnAction(ev1 -> {
+ Color newValue = fgColorButton.getValue();
+ if (newValue != null) {
+ executeCommand(FOREGROUND_COLOR_COMMAND, colorValueToHex(newValue));
+ fgColorButton.hide();
}
});
@@ -786,23 +729,17 @@
bgColorButton.impl_processCSS(true);
ColorPickerSkin bgColorPickerSkin = (ColorPickerSkin) bgColorButton.getSkin();
- String bgIcon = AccessController.doPrivileged(new PrivilegedAction() {
- @Override public String run() {
- return HTMLEditorSkin.class.getResource(resources.getString("backgroundColorIcon")).toString();
- }
- });
+ String bgIcon = AccessController.doPrivileged((PrivilegedAction) () -> HTMLEditorSkin.class.getResource(resources.getString("backgroundColorIcon")).toString());
((StyleableProperty)bgColorPickerSkin.imageUrlProperty()).applyStyle(null,bgIcon);
bgColorButton.setValue(DEFAULT_BG_COLOR);
bgColorButton.setTooltip(new Tooltip(resources.getString("backgroundColor")));
- bgColorButton.setOnAction(new EventHandler() {
- @Override public void handle(ActionEvent ev) {
- Color newValue = bgColorButton.getValue();
- if (newValue != null) {
- executeCommand(BACKGROUND_COLOR_COMMAND, colorValueToHex(newValue));
- bgColorButton.hide();
- }
+ bgColorButton.setOnAction(ev -> {
+ Color newValue = bgColorButton.getValue();
+ if (newValue != null) {
+ executeCommand(BACKGROUND_COLOR_COMMAND, colorValueToHex(newValue));
+ bgColorButton.hide();
}
});
}
@@ -821,21 +758,14 @@
button.getStyleClass().add(styleClass);
toolbar.getItems().add(button);
- Image icon = AccessController.doPrivileged(new PrivilegedAction() {
- @Override public Image run() {
- return new Image(HTMLEditorSkin.class.getResource(iconName).toString());
- }
- });
+ Image icon = AccessController.doPrivileged((PrivilegedAction) () -> new Image(HTMLEditorSkin.class.getResource(iconName).toString()));
// button.setGraphic(new ImageView(icon));
((StyleableProperty)button.graphicProperty()).applyStyle(null,new ImageView(icon));
button.setTooltip(new Tooltip(tooltipText));
- button.setOnAction(new EventHandler() {
- @Override
- public void handle(ActionEvent event) {
- executeCommand(command, null);
- updateToolbarState(false);
- }
+ button.setOnAction(event -> {
+ executeCommand(command, null);
+ updateToolbarState(false);
});
return button;
@@ -852,23 +782,16 @@
toggleButton.setToggleGroup(toggleGroup);
}
- Image icon = AccessController.doPrivileged(new PrivilegedAction() {
- @Override public Image run() {
- return new Image(HTMLEditorSkin.class.getResource(iconName).toString());
- }
- });
+ Image icon = AccessController.doPrivileged((PrivilegedAction) () -> new Image(HTMLEditorSkin.class.getResource(iconName).toString()));
((StyleableProperty)toggleButton.graphicProperty()).applyStyle(null,new ImageView(icon));
// toggleButton.setGraphic(new ImageView(icon));
toggleButton.setTooltip(new Tooltip(tooltipText));
if (!BOLD_COMMAND.equals(command)) {
- toggleButton.selectedProperty().addListener(new ChangeListener() {
- @Override
- public void changed(ObservableValue extends Boolean> observable, Boolean oldValue, Boolean newValue) {
- if (getCommandState(command) != newValue.booleanValue()) {
- executeCommand(command, null);
- }
+ toggleButton.selectedProperty().addListener((observable, oldValue, newValue) -> {
+ if (getCommandState(command) != newValue.booleanValue()) {
+ executeCommand(command, null);
}
});
}
@@ -899,11 +822,7 @@
if (orientation == RIGHT_TO_LEFT) {
try {
final String iconName = resources.getString("numbersIcon-rtl");
- Image icon = AccessController.doPrivileged(new PrivilegedAction() {
- @Override public Image run() {
- return new Image(HTMLEditorSkin.class.getResource(iconName).toString());
- }
- });
+ Image icon = AccessController.doPrivileged((PrivilegedAction) () -> new Image(HTMLEditorSkin.class.getResource(iconName).toString()));
numbersButton.setGraphic(new ImageView(icon));
} catch (java.util.MissingResourceException ex) {
// ignore
@@ -1066,48 +985,46 @@
}
private void enableToolbar(final boolean enable) {
- Platform.runLater(new Runnable() {
- @Override public void run() {
+ Platform.runLater(() -> {
- // Make sure buttons have been created to avoid NPE
- if (copyButton == null) return;
+ // Make sure buttons have been created to avoid NPE
+ if (copyButton == null) return;
- /*
- ** if we're to enable, we still only enable
- ** the cut/copy/paste buttons that make sense
- */
- if (enable) {
- copyButton.setDisable(!isCommandEnabled(COPY_COMMAND));
- cutButton.setDisable(!isCommandEnabled(CUT_COMMAND));
- pasteButton.setDisable(!isCommandEnabled(PASTE_COMMAND));
- }
- else {
- copyButton.setDisable(true);
- cutButton.setDisable(true);
- pasteButton.setDisable(true);
- }
+ /*
+ ** if we're to enable, we still only enable
+ ** the cut/copy/paste buttons that make sense
+ */
+ if (enable) {
+ copyButton.setDisable(!isCommandEnabled(COPY_COMMAND));
+ cutButton.setDisable(!isCommandEnabled(CUT_COMMAND));
+ pasteButton.setDisable(!isCommandEnabled(PASTE_COMMAND));
+ }
+ else {
+ copyButton.setDisable(true);
+ cutButton.setDisable(true);
+ pasteButton.setDisable(true);
+ }
// undoButton.setDisable(!enable);
// redoButton.setDisable(!enable);
- insertHorizontalRuleButton.setDisable(!enable);
- alignLeftButton.setDisable(!enable);
- alignCenterButton.setDisable(!enable);
- alignRightButton.setDisable(!enable);
- alignJustifyButton.setDisable(!enable);
- bulletsButton.setDisable(!enable);
- numbersButton.setDisable(!enable);
- indentButton.setDisable(!enable);
- outdentButton.setDisable(!enable);
- formatComboBox.setDisable(!enable);
- fontFamilyComboBox.setDisable(!enable);
- fontSizeComboBox.setDisable(!enable);
- boldButton.setDisable(!enable);
- italicButton.setDisable(!enable);
- underlineButton.setDisable(!enable);
- strikethroughButton.setDisable(!enable);
- fgColorButton.setDisable(!enable);
- bgColorButton.setDisable(!enable);
- }
+ insertHorizontalRuleButton.setDisable(!enable);
+ alignLeftButton.setDisable(!enable);
+ alignCenterButton.setDisable(!enable);
+ alignRightButton.setDisable(!enable);
+ alignJustifyButton.setDisable(!enable);
+ bulletsButton.setDisable(!enable);
+ numbersButton.setDisable(!enable);
+ indentButton.setDisable(!enable);
+ outdentButton.setDisable(!enable);
+ formatComboBox.setDisable(!enable);
+ fontFamilyComboBox.setDisable(!enable);
+ fontSizeComboBox.setDisable(!enable);
+ boldButton.setDisable(!enable);
+ italicButton.setDisable(!enable);
+ underlineButton.setDisable(!enable);
+ strikethroughButton.setDisable(!enable);
+ fgColorButton.setDisable(!enable);
+ bgColorButton.setDisable(!enable);
});
}
diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/EventLoopImpl.java b/modules/web/src/main/java/com/sun/javafx/webkit/EventLoopImpl.java
--- a/modules/web/src/main/java/com/sun/javafx/webkit/EventLoopImpl.java
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/EventLoopImpl.java
@@ -26,16 +26,13 @@
// a short delay so as to throttle the outer
// ScriptDebugServer::pauseIfNeeded loop.
final Object key = new Object();
- executor.schedule(new Runnable() {
- @Override
- public void run() {
- Platform.runLater(new Runnable() {
- @Override
- public void run() {
- Toolkit.getToolkit().exitNestedEventLoop(key, null);
- }
- });
- }
+ executor.schedule(() -> {
+ Platform.runLater(new Runnable() {
+ @Override
+ public void run() {
+ Toolkit.getToolkit().exitNestedEventLoop(key, null);
+ }
+ });
}, DELAY, TimeUnit.MILLISECONDS);
Toolkit.getToolkit().enterNestedEventLoop(key);
}
diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/UIClientImpl.java b/modules/web/src/main/java/com/sun/javafx/webkit/UIClientImpl.java
--- a/modules/web/src/main/java/com/sun/javafx/webkit/UIClientImpl.java
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/UIClientImpl.java
@@ -66,22 +66,16 @@
final PopupFeatures pf =
new PopupFeatures(menu, status, toolbar, resizable);
WebEngine popup = AccessController.doPrivileged(
- new PrivilegedAction() {
- @Override public WebEngine run() {
- return w.getCreatePopupHandler().call(pf);
- }
- }, getAccessContext());
+ (PrivilegedAction) () -> w.getCreatePopupHandler().call(pf), getAccessContext());
return Accessor.getPageFor(popup);
}
return null;
}
private void dispatchWebEvent(final EventHandler handler, final WebEvent ev) {
- AccessController.doPrivileged(new PrivilegedAction() {
- @Override public Void run() {
- handler.handle(ev);
- return null;
- }
+ AccessController.doPrivileged((PrivilegedAction) () -> {
+ handler.handle(ev);
+ return null;
}, getAccessContext());
}
@@ -148,11 +142,7 @@
final WebEngine w = getWebEngine();
if (w != null && w.getConfirmHandler() != null) {
return AccessController.doPrivileged(
- new PrivilegedAction() {
- @Override public Boolean run() {
- return w.getConfirmHandler().call(text);
- }
- }, getAccessContext());
+ (PrivilegedAction) () -> w.getConfirmHandler().call(text), getAccessContext());
}
return false;
}
@@ -162,11 +152,7 @@
if (w != null && w.getPromptHandler() != null) {
final PromptData data = new PromptData(text, defaultValue);
return AccessController.doPrivileged(
- new PrivilegedAction() {
- @Override public String run() {
- return w.getPromptHandler().call(data);
- }
- }, getAccessContext());
+ (PrivilegedAction) () -> w.getPromptHandler().call(data), getAccessContext());
}
return "";
}
diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java b/modules/web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java
--- a/modules/web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java
@@ -30,12 +30,8 @@
static {
backBufferSupported = Boolean.valueOf(
- AccessController.doPrivileged(new PrivilegedAction() {
- @Override public String run() {
- return System.getProperty(
- "com.sun.webkit.pagebackbuffer", "true");
- }
- }));
+ AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty(
+ "com.sun.webkit.pagebackbuffer", "true")));
}
public WebPageClientImpl(Accessor accessor) {
diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/drt/DumpRenderTree.java b/modules/web/src/main/java/com/sun/javafx/webkit/drt/DumpRenderTree.java
--- a/modules/web/src/main/java/com/sun/javafx/webkit/drt/DumpRenderTree.java
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/drt/DumpRenderTree.java
@@ -118,13 +118,11 @@
private static void initPlatform() throws Exception {
// initialize default toolkit
final CountDownLatch latch = new CountDownLatch(1);
- PlatformImpl.startup(new Runnable() {
- public void run() {
- new WebEngine(); // initialize Webkit classes
- System.loadLibrary("DumpRenderTreeJava");
- PageCache.setCapacity(1);
- latch.countDown();
- }
+ PlatformImpl.startup(() -> {
+ new WebEngine(); // initialize Webkit classes
+ System.loadLibrary("DumpRenderTreeJava");
+ PageCache.setCapacity(1);
+ latch.countDown();
});
// wait for libraries to load
latch.await();
@@ -132,18 +130,16 @@
private static void runTest(final String testString) throws Exception {
final CountDownLatch latch = new CountDownLatch(1);
- Invoker.getInvoker().invokeOnEventThread(new Runnable() {
- public void run() {
- new DumpRenderTree(testString, latch).run();
- }});
+ Invoker.getInvoker().invokeOnEventThread(() -> {
+ new DumpRenderTree(testString, latch).run();
+ });
// wait until test is finished
latch.await();
- Invoker.getInvoker().invokeOnEventThread(new Runnable() {
- public void run() {
- mlog("dispose");
- drt.uiClient.closePage();
- dispose();
- }});
+ Invoker.getInvoker().invokeOnEventThread(() -> {
+ mlog("dispose");
+ drt.uiClient.closePage();
+ dispose();
+ });
}
// called from native
diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/prism/PrismInvoker.java b/modules/web/src/main/java/com/sun/javafx/webkit/prism/PrismInvoker.java
--- a/modules/web/src/main/java/com/sun/javafx/webkit/prism/PrismInvoker.java
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/prism/PrismInvoker.java
@@ -16,10 +16,8 @@
private final AtomicBoolean isToolkitRunning = new AtomicBoolean(true);
public PrismInvoker() {
- Toolkit.getToolkit().addShutdownHook(new Runnable() {
- public void run() {
- isToolkitRunning.set(false);
- }
+ Toolkit.getToolkit().addShutdownHook(() -> {
+ isToolkitRunning.set(false);
});
}
diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/prism/RTImage.java b/modules/web/src/main/java/com/sun/javafx/webkit/prism/RTImage.java
--- a/modules/web/src/main/java/com/sun/javafx/webkit/prism/RTImage.java
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/prism/RTImage.java
@@ -79,10 +79,8 @@
int h = srcy2 - srcy1;
final IntBuffer pixels = IntBuffer.allocate(w * h);
- PrismInvoker.runOnRenderThread(new Runnable() {
- public void run() {
- getTexture().readPixels(pixels);
- }
+ PrismInvoker.runOnRenderThread(() -> {
+ getTexture().readPixels(pixels);
});
Image img = Image.fromIntArgbPreData(pixels, w, h);
Texture t = g.getResourceFactory().createTexture(
@@ -101,12 +99,10 @@
@Override
void dispose() {
- PrismInvoker.invokeOnRenderThread(new Runnable() {
- public void run() {
- if (txt != null) {
- txt.dispose();
- txt = null;
- }
+ PrismInvoker.invokeOnRenderThread(() -> {
+ if (txt != null) {
+ txt.dispose();
+ txt = null;
}
});
}
@@ -132,38 +128,36 @@
}
}
if (isNew || isDirty()) {
- PrismInvoker.runOnRenderThread(new Runnable() {
- public void run() {
- flushRQ();
- if (txt != null && pixelBuffer != null) {
- PixelFormat pf = txt.getPixelFormat();
- if (pf != PixelFormat.INT_ARGB_PRE &&
- pf != PixelFormat.BYTE_BGRA_PRE) {
+ PrismInvoker.runOnRenderThread(() -> {
+ flushRQ();
+ if (txt != null && pixelBuffer != null) {
+ PixelFormat pf = txt.getPixelFormat();
+ if (pf != PixelFormat.INT_ARGB_PRE &&
+ pf != PixelFormat.BYTE_BGRA_PRE) {
- throw new AssertionError("Unexpected pixel format: " + pf);
- }
+ throw new AssertionError("Unexpected pixel format: " + pf);
+ }
- RTTexture t = txt;
- if (pixelScale != 1.0f) {
- // Convert [txt] to a texture the size of the image
- ResourceFactory f = GraphicsPipeline.getDefaultResourceFactory();
- t = f.createRTTexture(width, height, Texture.WrapMode.CLAMP_NOT_NEEDED);
- Graphics g = t.createGraphics();
- g.drawTexture(txt, 0, 0, width, height,
- 0, 0, width * pixelScale, height * pixelScale);
- }
-
- pixelBuffer.rewind();
- int[] pixels = t.getPixels();
- if (pixels != null) {
- pixelBuffer.asIntBuffer().put(pixels);
- } else {
- t.readPixels(pixelBuffer);
- }
+ RTTexture t = txt;
+ if (pixelScale != 1.0f) {
+ // Convert [txt] to a texture the size of the image
+ ResourceFactory f = GraphicsPipeline.getDefaultResourceFactory();
+ t = f.createRTTexture(width, height, Texture.WrapMode.CLAMP_NOT_NEEDED);
+ Graphics g = t.createGraphics();
+ g.drawTexture(txt, 0, 0, width, height,
+ 0, 0, width * pixelScale, height * pixelScale);
+ }
- if (t != txt) {
- t.dispose();
- }
+ pixelBuffer.rewind();
+ int[] pixels = t.getPixels();
+ if (pixels != null) {
+ pixelBuffer.asIntBuffer().put(pixels);
+ } else {
+ t.readPixels(pixelBuffer);
+ }
+
+ if (t != txt) {
+ t.dispose();
}
}
});
diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCImageDecoderImpl.java b/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCImageDecoderImpl.java
--- a/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCImageDecoderImpl.java
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCImageDecoderImpl.java
@@ -89,11 +89,9 @@
};
}
};
- this.loader.valueProperty().addListener(new ChangeListener() {
- public void changed(ObservableValue extends ImageFrame[]> ov, ImageFrame[] old, ImageFrame[] frames) {
- if ((frames != null) && (loader != null)) {
- setFrames(frames);
- }
+ this.loader.valueProperty().addListener((ov, old, frames1) -> {
+ if ((frames != null) && (loader != null)) {
+ setFrames(frames);
}
});
}
diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCRadialGradient.java b/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCRadialGradient.java
--- a/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCRadialGradient.java
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCRadialGradient.java
@@ -16,18 +16,16 @@
final class WCRadialGradient extends WCGradient {
- static final Comparator COMPARATOR = new Comparator() {
- public int compare(Stop s1, Stop s2) {
- float o1 = s1.getOffset();
- float o2 = s2.getOffset();
- if (o1 < o2) {
- return -1;
- }
- if (o1 > o2) {
- return 1;
- }
- return 0;
+ static final Comparator COMPARATOR = (s1, s2) -> {
+ float o1 = s1.getOffset();
+ float o2 = s2.getOffset();
+ if (o1 < o2) {
+ return -1;
}
+ if (o1 > o2) {
+ return 1;
+ }
+ return 0;
};
private final boolean reverse;
diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCRenderQueueImpl.java b/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCRenderQueueImpl.java
--- a/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCRenderQueueImpl.java
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCRenderQueueImpl.java
@@ -19,10 +19,8 @@
@Override protected void flush() {
if (!isEmpty()) {
- PrismInvoker.invokeOnRenderThread(new Runnable() {
- @Override public void run() {
- decode();
- }
+ PrismInvoker.invokeOnRenderThread(() -> {
+ decode();
});
}
}
diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/theme/ContextMenuImpl.java b/modules/web/src/main/java/com/sun/javafx/webkit/theme/ContextMenuImpl.java
--- a/modules/web/src/main/java/com/sun/javafx/webkit/theme/ContextMenuImpl.java
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/theme/ContextMenuImpl.java
@@ -33,12 +33,10 @@
}
final ContextMenu popupMenu = new ContextMenu();
- popupMenu.setOnAction(new EventHandler() {
- @Override public void handle(ActionEvent t) {
- MenuItem item = (MenuItem) t.getTarget();
- log.log(Level.FINE, "onAction: item={0}", item);
- showContext.notifyItemSelected(((MenuItemPeer)item).getItemPeer().getAction());
- }
+ popupMenu.setOnAction(t -> {
+ MenuItem item = (MenuItem) t.getTarget();
+ log.log(Level.FINE, "onAction: item={0}", item);
+ showContext.notifyItemSelected(((MenuItemPeer)item).getItemPeer().getAction());
});
popupMenu.getItems().addAll(fillMenu());
diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/theme/PopupMenuImpl.java b/modules/web/src/main/java/com/sun/javafx/webkit/theme/PopupMenuImpl.java
--- a/modules/web/src/main/java/com/sun/javafx/webkit/theme/PopupMenuImpl.java
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/theme/PopupMenuImpl.java
@@ -28,28 +28,22 @@
public PopupMenuImpl() {
popupMenu = new ContextMenu();
- popupMenu.setOnHidden(new EventHandler() {
- @Override public void handle(WindowEvent t) {
- log.finer("onHidden");
- // Postpone notification. This is to let webkit
- // to process a mouse event first (in case the
- // event is the trigger of the closing). Otherwise,
- // if this is a click in a drop down list, webkit
- // will reopen the popup assuming it is hidden.
- Invoker.getInvoker().postOnEventThread(new Runnable() {
- public void run() {
- log.finer("onHidden: notifying");
- notifyPopupClosed();
- }
- });
- }
+ popupMenu.setOnHidden(t1 -> {
+ log.finer("onHidden");
+ // Postpone notification. This is to let webkit
+ // to process a mouse event first (in case the
+ // event is the trigger of the closing). Otherwise,
+ // if this is a click in a drop down list, webkit
+ // will reopen the popup assuming it is hidden.
+ Invoker.getInvoker().postOnEventThread(() -> {
+ log.finer("onHidden: notifying");
+ notifyPopupClosed();
+ });
});
- popupMenu.setOnAction(new EventHandler() {
- @Override public void handle(ActionEvent t) {
- MenuItem item = (MenuItem) t.getTarget();
- log.log(Level.FINE, "onAction: item={0}", item);
- notifySelectionCommited(popupMenu.getItems().indexOf(item));
- }
+ popupMenu.setOnAction(t -> {
+ MenuItem item = (MenuItem) t.getTarget();
+ log.log(Level.FINE, "onAction: item={0}", item);
+ notifySelectionCommited(popupMenu.getItems().indexOf(item));
});
}
diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/theme/RenderThemeImpl.java b/modules/web/src/main/java/com/sun/javafx/webkit/theme/RenderThemeImpl.java
--- a/modules/web/src/main/java/com/sun/javafx/webkit/theme/RenderThemeImpl.java
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/theme/RenderThemeImpl.java
@@ -205,11 +205,9 @@
public RenderThemeImpl(final Accessor accessor) {
this.accessor = accessor;
- pool = new Pool(new Pool.Notifier() {
- @Override public void notifyRemoved(FormControl fc) {
- // Remove the control from WebView when it's removed from the pool.
- accessor.removeChild(fc.asControl());
- }
+ pool = new Pool(fc -> {
+ // Remove the control from WebView when it's removed from the pool.
+ accessor.removeChild(fc.asControl());
}, FormControl.class);
accessor.addViewListener(new ViewListener(pool, accessor));
}
diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/theme/ScrollBarThemeImpl.java b/modules/web/src/main/java/com/sun/javafx/webkit/theme/ScrollBarThemeImpl.java
--- a/modules/web/src/main/java/com/sun/javafx/webkit/theme/ScrollBarThemeImpl.java
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/theme/ScrollBarThemeImpl.java
@@ -78,11 +78,9 @@
public ScrollBarThemeImpl(final Accessor accessor) {
this.accessor = accessor;
pool = new Pool(
- new Pool.Notifier() {
- @Override public void notifyRemoved(ScrollBarWidget sb) {
+ sb -> {
accessor.removeChild(sb);
- }
- }, ScrollBarWidget.class);
+ }, ScrollBarWidget.class);
accessor.addViewListener(new ViewListener(pool, accessor) {
@Override public void invalidated(Observable ov) {
super.invalidated(ov);
diff --git a/modules/web/src/main/java/com/sun/webkit/MainThread.java b/modules/web/src/main/java/com/sun/webkit/MainThread.java
--- a/modules/web/src/main/java/com/sun/webkit/MainThread.java
+++ b/modules/web/src/main/java/com/sun/webkit/MainThread.java
@@ -9,11 +9,8 @@
final class MainThread {
private static void fwkScheduleDispatchFunctions() {
- Invoker.getInvoker().postOnEventThread(new Runnable() {
- @Override
- public void run() {
- twkScheduleDispatchFunctions();
- }
+ Invoker.getInvoker().postOnEventThread(() -> {
+ twkScheduleDispatchFunctions();
});
}
diff --git a/modules/web/src/main/java/com/sun/webkit/Timer.java b/modules/web/src/main/java/com/sun/webkit/Timer.java
--- a/modules/web/src/main/java/com/sun/webkit/Timer.java
+++ b/modules/web/src/main/java/com/sun/webkit/Timer.java
@@ -23,13 +23,8 @@
public synchronized static Mode getMode() {
if (mode == null) {
mode = Boolean.valueOf(AccessController.doPrivileged(
- new PrivilegedAction() {
- @Override
- public String run() {
- return System.getProperty(
- "com.sun.webkit.platformticks", "true");
- }
- })) ? Mode.PLATFORM_TICKS : Mode.SEPARATE_THREAD;
+ (PrivilegedAction) () -> System.getProperty(
+ "com.sun.webkit.platformticks", "true"))) ? Mode.PLATFORM_TICKS : Mode.SEPARATE_THREAD;
}
return mode;
}
diff --git a/modules/web/src/main/java/com/sun/webkit/Utilities.java b/modules/web/src/main/java/com/sun/webkit/Utilities.java
--- a/modules/web/src/main/java/com/sun/webkit/Utilities.java
+++ b/modules/web/src/main/java/com/sun/webkit/Utilities.java
@@ -69,12 +69,7 @@
AccessControlContext acc)
throws Throwable {
try {
- return AccessController.doPrivileged(new PrivilegedExceptionAction