From 678b0261c380384c4fd8dd6b71528645a5148683 Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Wed, 2 Jun 2021 06:36:10 -0700 Subject: [PATCH 1/5] 8264139: Suppress removal warnings for Security Manager methods --- .../java/com/sun/javafx/PlatformUtil.java | 1 + .../com/sun/javafx/logging/PrintLogger.java | 2 ++ .../com/sun/javafx/logging/PulseLogger.java | 1 + .../com/sun/javafx/property/MethodHelper.java | 1 + .../sun/javafx/property/adapter/Disposer.java | 1 + .../com/sun/javafx/reflect/MethodUtil.java | 3 ++ .../com/sun/javafx/reflect/ReflectUtil.java | 6 ++-- .../adapter/JavaBeanBooleanProperty.java | 3 ++ .../adapter/JavaBeanDoubleProperty.java | 3 ++ .../adapter/JavaBeanFloatProperty.java | 3 ++ .../adapter/JavaBeanIntegerProperty.java | 3 ++ .../adapter/JavaBeanLongProperty.java | 3 ++ .../adapter/JavaBeanObjectProperty.java | 4 ++- .../adapter/JavaBeanStringProperty.java | 3 ++ .../ReadOnlyJavaBeanBooleanProperty.java | 2 ++ .../ReadOnlyJavaBeanDoubleProperty.java | 2 ++ .../ReadOnlyJavaBeanFloatProperty.java | 2 ++ .../ReadOnlyJavaBeanIntegerProperty.java | 2 ++ .../adapter/ReadOnlyJavaBeanLongProperty.java | 2 ++ .../ReadOnlyJavaBeanObjectProperty.java | 2 ++ .../ReadOnlyJavaBeanStringProperty.java | 2 ++ .../javafx/scene/control/skin/FXVKSkin.java | 1 + .../scene/control/skin/ListViewSkin.java | 1 + .../scene/control/skin/MenuBarSkin.java | 1 + .../scene/control/skin/TableViewSkinBase.java | 1 + .../control/skin/TextInputControlSkin.java | 1 + .../scene/control/skin/TreeViewSkin.java | 1 + .../java/com/sun/javafx/fxml/BeanAdapter.java | 1 + .../com/sun/javafx/fxml/MethodHelper.java | 1 + .../com/sun/javafx/fxml/ModuleHelper.java | 1 + .../src/main/java/javafx/fxml/FXMLLoader.java | 1 + .../java/com/sun/glass/ui/Accessible.java | 4 +++ .../java/com/sun/glass/ui/Application.java | 2 ++ .../main/java/com/sun/glass/ui/Platform.java | 1 + .../main/java/com/sun/glass/ui/Screen.java | 1 + .../src/main/java/com/sun/glass/ui/View.java | 1 + .../com/sun/glass/ui/gtk/GtkApplication.java | 1 + .../com/sun/glass/ui/ios/IosApplication.java | 1 + .../com/sun/glass/ui/mac/MacApplication.java | 1 + .../sun/glass/ui/mac/MacCommonDialogs.java | 1 + .../monocle/AndroidInputDeviceRegistry.java | 1 + .../ui/monocle/AndroidPlatformFactory.java | 1 + .../main/java/com/sun/glass/ui/monocle/C.java | 1 + .../ui/monocle/DispmanAcceleratedScreen.java | 2 ++ .../java/com/sun/glass/ui/monocle/EGL.java | 1 + .../glass/ui/monocle/EPDPlatformFactory.java | 1 + .../com/sun/glass/ui/monocle/EPDScreen.java | 1 + .../com/sun/glass/ui/monocle/EPDSettings.java | 1 + .../com/sun/glass/ui/monocle/EPDSystem.java | 1 + .../com/sun/glass/ui/monocle/FBDevScreen.java | 1 + .../sun/glass/ui/monocle/HeadlessScreen.java | 1 + .../com/sun/glass/ui/monocle/KeyInput.java | 1 + .../com/sun/glass/ui/monocle/LinuxArch.java | 1 + .../ui/monocle/LinuxInputDeviceRegistry.java | 2 ++ .../ui/monocle/LinuxPlatformFactory.java | 1 + .../com/sun/glass/ui/monocle/LinuxSystem.java | 1 + .../glass/ui/monocle/LinuxTouchProcessor.java | 1 + .../glass/ui/monocle/LinuxTouchTransform.java | 2 ++ .../glass/ui/monocle/MonocleApplication.java | 1 + .../sun/glass/ui/monocle/MonocleSettings.java | 1 + .../sun/glass/ui/monocle/NativePlatform.java | 1 + .../ui/monocle/NativePlatformFactory.java | 1 + .../com/sun/glass/ui/monocle/TouchInput.java | 2 ++ .../com/sun/glass/ui/monocle/VNCScreen.java | 1 + .../main/java/com/sun/glass/ui/monocle/X.java | 1 + .../ui/monocle/X11AcceleratedScreen.java | 1 + .../com/sun/glass/ui/monocle/X11Platform.java | 1 + .../glass/ui/monocle/X11PlatformFactory.java | 1 + .../com/sun/glass/ui/monocle/X11Screen.java | 1 + .../com/sun/glass/ui/win/WinApplication.java | 1 + .../com/sun/glass/utils/NativeLibLoader.java | 1 + .../sun/javafx/application/LauncherImpl.java | 1 + .../sun/javafx/application/PlatformImpl.java | 12 ++++++++ .../java/com/sun/javafx/css/StyleManager.java | 2 ++ .../sun/javafx/font/AndroidFontFinder.java | 1 + .../com/sun/javafx/font/DFontDecoder.java | 1 + .../java/com/sun/javafx/font/Disposer.java | 1 + .../sun/javafx/font/FontConfigManager.java | 1 + .../com/sun/javafx/font/FontFileReader.java | 1 + .../com/sun/javafx/font/FontFileWriter.java | 4 +++ .../com/sun/javafx/font/MacFontFinder.java | 1 + .../com/sun/javafx/font/PrismFontFactory.java | 1 + .../com/sun/javafx/font/PrismFontFile.java | 2 ++ .../java/com/sun/javafx/font/coretext/OS.java | 1 + .../com/sun/javafx/font/directwrite/OS.java | 1 + .../sun/javafx/font/freetype/OSFreetype.java | 1 + .../com/sun/javafx/font/freetype/OSPango.java | 1 + .../sun/javafx/iio/ios/IosImageLoader.java | 1 + .../sun/javafx/iio/jpeg/JPEGImageLoader.java | 1 + .../com/sun/javafx/stage/WindowHelper.java | 2 ++ .../java/com/sun/javafx/tk/DummyToolkit.java | 6 ++-- .../com/sun/javafx/tk/LocalClipboard.java | 2 +- .../com/sun/javafx/tk/PermissionHelper.java | 2 ++ .../java/com/sun/javafx/tk/TKClipboard.java | 2 +- .../main/java/com/sun/javafx/tk/TKScene.java | 1 + .../main/java/com/sun/javafx/tk/TKStage.java | 2 +- .../main/java/com/sun/javafx/tk/Toolkit.java | 29 +++++++++++++++---- .../sun/javafx/tk/quantum/EmbeddedScene.java | 9 ++++++ .../sun/javafx/tk/quantum/EmbeddedStage.java | 3 +- .../com/sun/javafx/tk/quantum/GlassScene.java | 4 +++ .../tk/quantum/GlassSceneDnDEventHandler.java | 6 ++++ .../com/sun/javafx/tk/quantum/GlassStage.java | 5 ++++ .../tk/quantum/GlassViewEventHandler.java | 1 + .../tk/quantum/GlassWindowEventHandler.java | 3 ++ .../javafx/tk/quantum/PerformanceLogger.java | 1 + .../tk/quantum/PerformanceTrackerHelper.java | 2 ++ .../javafx/tk/quantum/PrismImageLoader2.java | 5 ++++ .../javafx/tk/quantum/QuantumClipboard.java | 6 +++- .../javafx/tk/quantum/QuantumRenderer.java | 3 ++ .../sun/javafx/tk/quantum/QuantumToolkit.java | 17 +++++++++-- .../tk/quantum/RotateGestureRecognizer.java | 1 + .../tk/quantum/ScrollGestureRecognizer.java | 1 + .../tk/quantum/SwipeGestureRecognizer.java | 1 + .../sun/javafx/tk/quantum/WindowStage.java | 4 ++- .../tk/quantum/ZoomGestureRecognizer.java | 1 + .../com/sun/javafx/util/ModuleHelper.java | 1 + .../main/java/com/sun/javafx/util/Utils.java | 2 ++ .../sun/marlin/DMarlinRenderingEngine.java | 1 + .../java/com/sun/marlin/MarlinProperties.java | 4 +++ .../java/com/sun/marlin/OffHeapArray.java | 1 + .../java/com/sun/marlin/RendererStats.java | 1 + .../java/com/sun/prism/d3d/D3DPipeline.java | 1 + .../com/sun/prism/d3d/D3DResourceFactory.java | 1 + .../java/com/sun/prism/es2/ES2Pipeline.java | 1 + .../java/com/sun/prism/es2/GLFactory.java | 1 + .../java/com/sun/prism/es2/GLPixelFormat.java | 1 + .../com/sun/prism/es2/MonocleGLDrawable.java | 1 + .../java/com/sun/prism/impl/BufferUtil.java | 1 + .../com/sun/prism/impl/PrismSettings.java | 1 + .../sun/prism/impl/ps/BaseShaderGraphics.java | 1 + .../com/sun/prism/j2d/J2DFontFactory.java | 3 ++ .../sun/prism/j2d/print/J2DPrinterJob.java | 1 + .../java/com/sun/prism/sw/SWPipeline.java | 1 + .../com/sun/scenario/effect/ImageData.java | 1 + .../sun/scenario/effect/impl/BufferUtil.java | 1 + .../sun/scenario/effect/impl/ImagePool.java | 1 + .../sun/scenario/effect/impl/Renderer.java | 1 + .../scenario/effect/impl/RendererFactory.java | 1 + .../impl/state/LinearConvolveRenderState.java | 1 + .../impl/sw/sse/SSERendererDelegate.java | 1 + .../main/java/javafx/animation/Animation.java | 3 ++ .../java/javafx/animation/AnimationTimer.java | 3 ++ .../java/javafx/application/Preloader.java | 1 + .../main/java/javafx/concurrent/Service.java | 3 ++ .../src/main/java/javafx/concurrent/Task.java | 1 + .../javafx/css/converter/URLConverter.java | 2 ++ .../src/main/java/javafx/print/Printer.java | 2 ++ .../main/java/javafx/print/PrinterJob.java | 2 ++ .../src/main/java/javafx/scene/Node.java | 2 +- .../java/javafx/scene/PropertyHelper.java | 1 + .../src/main/java/javafx/scene/Scene.java | 4 +++ .../java/javafx/scene/input/Clipboard.java | 1 + .../main/java/javafx/scene/robot/Robot.java | 1 + .../src/main/java/javafx/scene/text/Font.java | 1 + .../main/java/javafx/stage/PopupWindow.java | 1 + .../src/main/java/javafx/stage/Stage.java | 1 + .../src/main/java/javafx/stage/Window.java | 3 ++ .../sun/media/jfxmedia/locator/Locator.java | 1 + .../com/sun/media/jfxmediaimpl/HostUtils.java | 1 + .../jfxmediaimpl/NativeMediaManager.java | 1 + .../platform/PlatformManager.java | 1 + .../platform/osx/OSXPlatform.java | 1 + .../com/sun/javafx/embed/swing/Disposer.java | 1 + .../com/sun/javafx/embed/swing/FXDnD.java | 1 + .../javafx/embed/swing/SwingFXUtilsImpl.java | 1 + .../java/javafx/embed/swing/JFXPanel.java | 4 +++ .../java/javafx/embed/swing/SwingNode.java | 1 + .../main/java/javafx/embed/swt/FXCanvas.java | 2 ++ .../java/javafx/embed/swt/SWTFXUtils.java | 4 +++ .../com/sun/javafx/webkit/UIClientImpl.java | 5 ++++ .../sun/javafx/webkit/WebPageClientImpl.java | 1 + .../webkit/prism/WCGraphicsPrismContext.java | 1 + .../main/java/com/sun/webkit/Disposer.java | 1 + .../java/com/sun/webkit/MethodHelper.java | 1 + .../src/main/java/com/sun/webkit/Timer.java | 1 + .../main/java/com/sun/webkit/Utilities.java | 1 + .../src/main/java/com/sun/webkit/WebPage.java | 1 + .../java/com/sun/webkit/dom/JSObject.java | 9 ++++-- .../com/sun/webkit/network/HTTP2Loader.java | 5 +++- .../sun/webkit/network/NetworkContext.java | 1 + .../sun/webkit/network/PublicSuffixes.java | 3 ++ .../webkit/network/SocketStreamHandle.java | 4 +++ .../com/sun/webkit/network/URLLoader.java | 3 +- .../java/com/sun/webkit/network/URLs.java | 1 + .../java/javafx/scene/web/HTMLEditorSkin.java | 2 ++ .../main/java/javafx/scene/web/WebEngine.java | 1 + 186 files changed, 358 insertions(+), 27 deletions(-) diff --git a/modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java b/modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java index e4fbf555cac..c8d2a0dfa24 100644 --- a/modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java +++ b/modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java @@ -35,6 +35,7 @@ import java.net.URL; import java.util.Properties; +@SuppressWarnings("removal") public class PlatformUtil { // NOTE: since this class can be initialized by application code in some diff --git a/modules/javafx.base/src/main/java/com/sun/javafx/logging/PrintLogger.java b/modules/javafx.base/src/main/java/com/sun/javafx/logging/PrintLogger.java index c0d5c50c297..63e56a2e694 100644 --- a/modules/javafx.base/src/main/java/com/sun/javafx/logging/PrintLogger.java +++ b/modules/javafx.base/src/main/java/com/sun/javafx/logging/PrintLogger.java @@ -54,12 +54,14 @@ class PrintLogger extends Logger { * the threshold, then it is logged, otherwise an abbreviated representation including * only the time of the pulse is logged. */ + @SuppressWarnings("removal") private static long THRESHOLD = (long) AccessController.doPrivileged((PrivilegedAction) () -> Integer.getInteger("javafx.pulseLogger.threshold", 17)); /** * Optionally exit after a given number of pulses */ + @SuppressWarnings("removal") private static final int EXIT_ON_PULSE = AccessController.doPrivileged((PrivilegedAction) () -> Integer.getInteger("javafx.pulseLogger.exitOnPulse", 0)); diff --git a/modules/javafx.base/src/main/java/com/sun/javafx/logging/PulseLogger.java b/modules/javafx.base/src/main/java/com/sun/javafx/logging/PulseLogger.java index 27a9ead4a9b..9413e599c83 100644 --- a/modules/javafx.base/src/main/java/com/sun/javafx/logging/PulseLogger.java +++ b/modules/javafx.base/src/main/java/com/sun/javafx/logging/PulseLogger.java @@ -102,6 +102,7 @@ public static void newInput(String name) { * @return true if the user requested pulse logging by setting the system * property javafx.pulseLogger to true, false otherwise. */ + @SuppressWarnings("removal") public static boolean isPulseLoggingRequested() { return AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.pulseLogger")); } diff --git a/modules/javafx.base/src/main/java/com/sun/javafx/property/MethodHelper.java b/modules/javafx.base/src/main/java/com/sun/javafx/property/MethodHelper.java index 20636a28bfc..cae64ffb953 100644 --- a/modules/javafx.base/src/main/java/com/sun/javafx/property/MethodHelper.java +++ b/modules/javafx.base/src/main/java/com/sun/javafx/property/MethodHelper.java @@ -36,6 +36,7 @@ * Utility class to wrap method invocation. */ public class MethodHelper { + @SuppressWarnings("removal") private static final boolean logAccessErrors = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("sun.reflect.debugModuleAccessChecks")); diff --git a/modules/javafx.base/src/main/java/com/sun/javafx/property/adapter/Disposer.java b/modules/javafx.base/src/main/java/com/sun/javafx/property/adapter/Disposer.java index 2f4a2fcd28f..4699b89b593 100644 --- a/modules/javafx.base/src/main/java/com/sun/javafx/property/adapter/Disposer.java +++ b/modules/javafx.base/src/main/java/com/sun/javafx/property/adapter/Disposer.java @@ -42,6 +42,7 @@ * When the object becomes phantom-reachable, the run() method * of the associated Runnable object will be called. */ +@SuppressWarnings("removal") public class Disposer implements Runnable { private static final ReferenceQueue queue = new ReferenceQueue(); private static final Map records = new ConcurrentHashMap<>(); diff --git a/modules/javafx.base/src/main/java/com/sun/javafx/reflect/MethodUtil.java b/modules/javafx.base/src/main/java/com/sun/javafx/reflect/MethodUtil.java index 46697b6e701..9ba8f9a71ae 100644 --- a/modules/javafx.base/src/main/java/com/sun/javafx/reflect/MethodUtil.java +++ b/modules/javafx.base/src/main/java/com/sun/javafx/reflect/MethodUtil.java @@ -58,6 +58,7 @@ class Trampoline { } } + @SuppressWarnings("removal") private static void ensureInvocableMethod(Method m) throws InvocationTargetException { @@ -107,6 +108,7 @@ public static Method[] getMethods(Class cls) { * we're done. */ /*public*/ + @SuppressWarnings("removal") static Method[] getPublicMethods(Class cls) { // compatibility for update release if (System.getSecurityManager() == null) { @@ -291,6 +293,7 @@ public static Object invoke(Method m, Object obj, Object[] params) } } + @SuppressWarnings("removal") private static Method getTrampoline() { try { return AccessController.doPrivileged( diff --git a/modules/javafx.base/src/main/java/com/sun/javafx/reflect/ReflectUtil.java b/modules/javafx.base/src/main/java/com/sun/javafx/reflect/ReflectUtil.java index ae27214970d..ce8967bf5fc 100644 --- a/modules/javafx.base/src/main/java/com/sun/javafx/reflect/ReflectUtil.java +++ b/modules/javafx.base/src/main/java/com/sun/javafx/reflect/ReflectUtil.java @@ -41,6 +41,7 @@ private ReflectUtil() { * also check the package access on the proxy interfaces. */ public static void checkPackageAccess(Class clazz) { + @SuppressWarnings("removal") SecurityManager s = System.getSecurityManager(); if (s != null) { privateCheckPackageAccess(s, clazz); @@ -50,7 +51,7 @@ public static void checkPackageAccess(Class clazz) { /** * NOTE: should only be called if a SecurityManager is installed */ - private static void privateCheckPackageAccess(SecurityManager s, Class clazz) { + private static void privateCheckPackageAccess(@SuppressWarnings("removal") SecurityManager s, Class clazz) { while (clazz.isArray()) { clazz = clazz.getComponentType(); } @@ -72,6 +73,7 @@ private static void privateCheckPackageAccess(SecurityManager s, Class clazz) * the true caller (application). */ public static void checkPackageAccess(String name) { + @SuppressWarnings("removal") SecurityManager s = System.getSecurityManager(); if (s != null) { String cname = name.replace('/', '.'); @@ -100,7 +102,7 @@ public static boolean isPackageAccessible(Class clazz) { /** * NOTE: should only be called if a SecurityManager is installed */ - private static void privateCheckProxyPackageAccess(SecurityManager s, Class clazz) { + private static void privateCheckProxyPackageAccess(@SuppressWarnings("removal") SecurityManager s, Class clazz) { // check proxy interfaces if the given class is a proxy class if (Proxy.isProxyClass(clazz)) { for (Class intf : clazz.getInterfaces()) { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanBooleanProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanBooleanProperty.java index 07acc7ad348..ab023a3c57f 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanBooleanProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanBooleanProperty.java @@ -96,6 +96,7 @@ public final class JavaBeanBooleanProperty extends BooleanProperty implements Ja private ObservableValue observable = null; private ExpressionHelper helper = null; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); JavaBeanBooleanProperty(PropertyDescriptor descriptor, Object bean) { @@ -112,6 +113,7 @@ public final class JavaBeanBooleanProperty extends BooleanProperty implements Ja * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public boolean get() { return AccessController.doPrivileged((PrivilegedAction) () -> { @@ -132,6 +134,7 @@ public boolean get() { * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public void set(final boolean value) { if (isBound()) { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanDoubleProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanDoubleProperty.java index 91ecebab87c..010f4b052fa 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanDoubleProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanDoubleProperty.java @@ -96,6 +96,7 @@ public final class JavaBeanDoubleProperty extends DoubleProperty implements Java private ObservableValue observable = null; private ExpressionHelper helper = null; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); JavaBeanDoubleProperty(PropertyDescriptor descriptor, Object bean) { @@ -112,6 +113,7 @@ public final class JavaBeanDoubleProperty extends DoubleProperty implements Java * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public double get() { return AccessController.doPrivileged((PrivilegedAction) () -> { @@ -133,6 +135,7 @@ public double get() { * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public void set(final double value) { if (isBound()) { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanFloatProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanFloatProperty.java index 8e2f8cacf3e..1e6db99ca50 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanFloatProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanFloatProperty.java @@ -96,6 +96,7 @@ public final class JavaBeanFloatProperty extends FloatProperty implements JavaBe private ObservableValue observable = null; private ExpressionHelper helper = null; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); JavaBeanFloatProperty(PropertyDescriptor descriptor, Object bean) { @@ -112,6 +113,7 @@ public final class JavaBeanFloatProperty extends FloatProperty implements JavaBe * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public float get() { return AccessController.doPrivileged((PrivilegedAction) () -> { @@ -133,6 +135,7 @@ public float get() { * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public void set(final float value) { if (isBound()) { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanIntegerProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanIntegerProperty.java index 58171fbb5dc..833d91d19cb 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanIntegerProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanIntegerProperty.java @@ -96,6 +96,7 @@ public final class JavaBeanIntegerProperty extends IntegerProperty implements Ja private ObservableValue observable = null; private ExpressionHelper helper = null; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); JavaBeanIntegerProperty(PropertyDescriptor descriptor, Object bean) { @@ -112,6 +113,7 @@ public final class JavaBeanIntegerProperty extends IntegerProperty implements Ja * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public int get() { return AccessController.doPrivileged((PrivilegedAction) () -> { @@ -133,6 +135,7 @@ public int get() { * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public void set(final int value) { if (isBound()) { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanLongProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanLongProperty.java index 9605ecdb7cf..115a237e98c 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanLongProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanLongProperty.java @@ -96,6 +96,7 @@ public final class JavaBeanLongProperty extends LongProperty implements JavaBean private ObservableValue observable = null; private ExpressionHelper helper = null; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); JavaBeanLongProperty(PropertyDescriptor descriptor, Object bean) { @@ -112,6 +113,7 @@ public final class JavaBeanLongProperty extends LongProperty implements JavaBean * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public long get() { return AccessController.doPrivileged((PrivilegedAction) () -> { @@ -133,6 +135,7 @@ public long get() { * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public void set(final long value) { if (isBound()) { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanObjectProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanObjectProperty.java index 00b4272bdd3..01a781660d4 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanObjectProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanObjectProperty.java @@ -98,6 +98,7 @@ public final class JavaBeanObjectProperty extends ObjectProperty implement private ObservableValue observable = null; private ExpressionHelper helper = null; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); JavaBeanObjectProperty(PropertyDescriptor descriptor, Object bean) { @@ -114,7 +115,7 @@ public final class JavaBeanObjectProperty extends ObjectProperty implement * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ - @SuppressWarnings("unchecked") + @SuppressWarnings({"removal","unchecked"}) @Override public T get() { return AccessController.doPrivileged((PrivilegedAction) () -> { @@ -135,6 +136,7 @@ public T get() { * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public void set(final T value) { if (isBound()) { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanStringProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanStringProperty.java index 3e479a73509..f2b42c8039a 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanStringProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanStringProperty.java @@ -96,6 +96,7 @@ public final class JavaBeanStringProperty extends StringProperty implements Java private ObservableValue observable = null; private ExpressionHelper helper = null; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); JavaBeanStringProperty(PropertyDescriptor descriptor, Object bean) { @@ -112,6 +113,7 @@ public final class JavaBeanStringProperty extends StringProperty implements Java * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public String get() { return AccessController.doPrivileged((PrivilegedAction) () -> { @@ -132,6 +134,7 @@ public String get() { * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public void set(final String value) { if (isBound()) { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanProperty.java index af3928fc13a..a4ef4d8e3f7 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanProperty.java @@ -85,6 +85,7 @@ public final class ReadOnlyJavaBeanBooleanProperty extends ReadOnlyBooleanProper private final ReadOnlyPropertyDescriptor descriptor; private final ReadOnlyPropertyDescriptor.ReadOnlyListener listener; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); ReadOnlyJavaBeanBooleanProperty(ReadOnlyPropertyDescriptor descriptor, Object bean) { @@ -101,6 +102,7 @@ public final class ReadOnlyJavaBeanBooleanProperty extends ReadOnlyBooleanProper * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public boolean get() { return AccessController.doPrivileged((PrivilegedAction) () -> { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanDoubleProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanDoubleProperty.java index 4d3b686c1f0..4569a49d8c9 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanDoubleProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanDoubleProperty.java @@ -85,6 +85,7 @@ public final class ReadOnlyJavaBeanDoubleProperty extends ReadOnlyDoubleProperty private final ReadOnlyPropertyDescriptor descriptor; private final ReadOnlyPropertyDescriptor.ReadOnlyListener listener; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); ReadOnlyJavaBeanDoubleProperty(ReadOnlyPropertyDescriptor descriptor, Object bean) { @@ -101,6 +102,7 @@ public final class ReadOnlyJavaBeanDoubleProperty extends ReadOnlyDoubleProperty * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public double get() { return AccessController.doPrivileged((PrivilegedAction) () -> { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatProperty.java index eedf65d8b74..dcbd1cad6ae 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatProperty.java @@ -85,6 +85,7 @@ public final class ReadOnlyJavaBeanFloatProperty extends ReadOnlyFloatPropertyBa private final ReadOnlyPropertyDescriptor descriptor; private final ReadOnlyPropertyDescriptor.ReadOnlyListener listener; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); ReadOnlyJavaBeanFloatProperty(ReadOnlyPropertyDescriptor descriptor, Object bean) { @@ -101,6 +102,7 @@ public final class ReadOnlyJavaBeanFloatProperty extends ReadOnlyFloatPropertyBa * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public float get() { return AccessController.doPrivileged((PrivilegedAction) () -> { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerProperty.java index 1c41c5e1e30..c8c11799201 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerProperty.java @@ -85,6 +85,7 @@ public final class ReadOnlyJavaBeanIntegerProperty extends ReadOnlyIntegerProper private final ReadOnlyPropertyDescriptor descriptor; private final ReadOnlyPropertyDescriptor.ReadOnlyListener listener; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); ReadOnlyJavaBeanIntegerProperty(ReadOnlyPropertyDescriptor descriptor, Object bean) { @@ -101,6 +102,7 @@ public final class ReadOnlyJavaBeanIntegerProperty extends ReadOnlyIntegerProper * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public int get() { return AccessController.doPrivileged((PrivilegedAction) () -> { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanLongProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanLongProperty.java index cf0ac2b5207..1c15730ba53 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanLongProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanLongProperty.java @@ -85,6 +85,7 @@ public final class ReadOnlyJavaBeanLongProperty extends ReadOnlyLongPropertyBase private final ReadOnlyPropertyDescriptor descriptor; private final ReadOnlyPropertyDescriptor.ReadOnlyListener listener; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); ReadOnlyJavaBeanLongProperty(ReadOnlyPropertyDescriptor descriptor, Object bean) { @@ -101,6 +102,7 @@ public final class ReadOnlyJavaBeanLongProperty extends ReadOnlyLongPropertyBase * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public long get() { return AccessController.doPrivileged((PrivilegedAction) () -> { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectProperty.java index 37b7963549b..60494d83c17 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectProperty.java @@ -87,6 +87,7 @@ public final class ReadOnlyJavaBeanObjectProperty extends ReadOnlyObjectPrope private final ReadOnlyPropertyDescriptor descriptor; private final ReadOnlyPropertyDescriptor.ReadOnlyListener listener; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); ReadOnlyJavaBeanObjectProperty(ReadOnlyPropertyDescriptor descriptor, Object bean) { @@ -103,6 +104,7 @@ public final class ReadOnlyJavaBeanObjectProperty extends ReadOnlyObjectPrope * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public T get() { return AccessController.doPrivileged((PrivilegedAction) () -> { diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanStringProperty.java b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanStringProperty.java index f30455b7ded..e6e9d7c75b6 100644 --- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanStringProperty.java +++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanStringProperty.java @@ -85,6 +85,7 @@ public final class ReadOnlyJavaBeanStringProperty extends ReadOnlyStringProperty private final ReadOnlyPropertyDescriptor descriptor; private final ReadOnlyPropertyDescriptor.ReadOnlyListener listener; + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); ReadOnlyJavaBeanStringProperty(ReadOnlyPropertyDescriptor descriptor, Object bean) { @@ -101,6 +102,7 @@ public final class ReadOnlyJavaBeanStringProperty extends ReadOnlyStringProperty * property throws an {@code IllegalAccessException} or an * {@code InvocationTargetException}. */ + @SuppressWarnings("removal") @Override public String get() { return AccessController.doPrivileged((PrivilegedAction) () -> { diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java index d374c6bae26..9e8b735d4b1 100644 --- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java +++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java @@ -76,6 +76,7 @@ import java.security.PrivilegedAction; +@SuppressWarnings("removal") public class FXVKSkin extends SkinBase { private static final int GAP = 6; diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/ListViewSkin.java b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/ListViewSkin.java index b901bbb9b24..ff2a733aa3f 100644 --- a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/ListViewSkin.java +++ b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/ListViewSkin.java @@ -79,6 +79,7 @@ public class ListViewSkin extends VirtualContainerBase, ListCell< // is set to true. This is done in order to make ListView functional // on embedded systems with touch screens which do not generate scroll // events for touch drag gestures. + @SuppressWarnings("removal") private static final boolean IS_PANNABLE = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.scene.control.skin.ListViewSkin.pannable")); diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/MenuBarSkin.java b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/MenuBarSkin.java index a45413c8234..632415a006e 100644 --- a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/MenuBarSkin.java +++ b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/MenuBarSkin.java @@ -110,6 +110,7 @@ public class MenuBarSkin extends SkinBase { static { final Predicate findStage = (w) -> w instanceof Stage; + @SuppressWarnings("removal") ObservableList windows = AccessController.doPrivileged( (PrivilegedAction>) () -> Window.getWindows(), null, diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableViewSkinBase.java b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableViewSkinBase.java index f55ad5ea593..7c27b838095 100644 --- a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableViewSkinBase.java +++ b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableViewSkinBase.java @@ -92,6 +92,7 @@ public abstract class TableViewSkinBase) () -> Boolean.getBoolean("javafx.scene.control.skin.TableViewSkin.pannable")); diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TextInputControlSkin.java b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TextInputControlSkin.java index 9309cbbe78a..78a500941a4 100644 --- a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TextInputControlSkin.java +++ b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TextInputControlSkin.java @@ -93,6 +93,7 @@ * @see TextFieldSkin * @see TextAreaSkin */ +@SuppressWarnings("removal") public abstract class TextInputControlSkin extends SkinBase { /************************************************************************** diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TreeViewSkin.java b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TreeViewSkin.java index e86abed29c0..8ef9ac5fded 100644 --- a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TreeViewSkin.java +++ b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TreeViewSkin.java @@ -71,6 +71,7 @@ public class TreeViewSkin extends VirtualContainerBase, TreeCell< // is set to true. This is done in order to make TreeView functional // on embedded systems with touch screens which do not generate scroll // events for touch drag gestures. + @SuppressWarnings("removal") private static final boolean IS_PANNABLE = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.scene.control.skin.TreeViewSkin.pannable")); diff --git a/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/BeanAdapter.java b/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/BeanAdapter.java index db7e880ca8e..0329d3ac3e2 100644 --- a/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/BeanAdapter.java +++ b/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/BeanAdapter.java @@ -119,6 +119,7 @@ private static MethodCache getClassMethodCache(final Class type) { if (Modifier.isPublic(type.getModifiers())) { // only interested in public methods in public classes in // non-restricted packages + @SuppressWarnings("removal") final Method[] declaredMethods = AccessController.doPrivileged( new PrivilegedAction() { diff --git a/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/MethodHelper.java b/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/MethodHelper.java index e9c19e117c7..8c8f3000778 100644 --- a/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/MethodHelper.java +++ b/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/MethodHelper.java @@ -36,6 +36,7 @@ * Utility class to wrap method invocation. */ public class MethodHelper { + @SuppressWarnings("removal") private static final boolean logAccessErrors = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("sun.reflect.debugModuleAccessChecks")); diff --git a/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/ModuleHelper.java b/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/ModuleHelper.java index 12cd2d253b3..546c96c935b 100644 --- a/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/ModuleHelper.java +++ b/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/ModuleHelper.java @@ -31,6 +31,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; +@SuppressWarnings("removal") public class ModuleHelper { private static final Method getModuleMethod; private static final Method getResourceAsStreamMethod; diff --git a/modules/javafx.fxml/src/main/java/javafx/fxml/FXMLLoader.java b/modules/javafx.fxml/src/main/java/javafx/fxml/FXMLLoader.java index 0e8100c3fc0..b72ced341b9 100644 --- a/modules/javafx.fxml/src/main/java/javafx/fxml/FXMLLoader.java +++ b/modules/javafx.fxml/src/main/java/javafx/fxml/FXMLLoader.java @@ -104,6 +104,7 @@ * * @since JavaFX 2.0 */ +@SuppressWarnings("removal") public class FXMLLoader { // Indicates permission to get the ClassLoader diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Accessible.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Accessible.java index 47fd907f9ff..817cd63f8f4 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Accessible.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Accessible.java @@ -52,6 +52,7 @@ public Object getAttribute(AccessibleAttribute attribute, Object... parameters) public void executeAction(AccessibleAction action, Object... parameters) { } + @SuppressWarnings("removal") public abstract AccessControlContext getAccessControlContext(); } @@ -125,6 +126,7 @@ protected Accessible getContainerAccessible(AccessibleRole targetRole) { * IMPORTANT: Calling to the user code should not proceed if * this method returns NULL. */ + @SuppressWarnings("removal") private final AccessControlContext getAccessControlContext() { AccessControlContext acc = null; try { @@ -160,6 +162,7 @@ private class GetAttribute implements PrivilegedAction { private GetAttribute getAttribute = new GetAttribute(); + @SuppressWarnings("removal") public Object getAttribute(AccessibleAttribute attribute, Object... parameters) { AccessControlContext acc = getAccessControlContext(); if (acc == null) return null; @@ -181,6 +184,7 @@ private class ExecuteAction implements PrivilegedAction { private ExecuteAction executeAction = new ExecuteAction(); + @SuppressWarnings("removal") public void executeAction(AccessibleAction action, Object... parameters) { AccessControlContext acc = getAccessControlContext(); if (acc == null) return; diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Application.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Application.java index b0e3b84de8c..f1060fe918a 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Application.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Application.java @@ -96,6 +96,7 @@ public boolean handleThemeChanged(String themeName) { private static boolean loaded = false; private static Application application; private static Thread eventThread; + @SuppressWarnings("removal") private static final boolean disableThreadChecks = AccessController.doPrivileged((PrivilegedAction) () -> { final String str = @@ -214,6 +215,7 @@ public void setName(String name) { */ public String getDataDirectory() { checkEventThread(); + @SuppressWarnings("removal") String userHome = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("user.home")); return userHome + File.separator + "." + name + File.separator; } diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Platform.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Platform.java index 467b2255264..b4616114d00 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Platform.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Platform.java @@ -42,6 +42,7 @@ static public synchronized String determinePlatform() { if (type == null) { // Provide for a runtime override, allowing EGL for example + @SuppressWarnings("removal") String userPlatform = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("glass.platform")); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java index 4be9c6da4ac..6e17c5d61e1 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java @@ -30,6 +30,7 @@ import java.util.Collections; import java.util.List; +@SuppressWarnings("removal") public final class Screen { // the list of attached screens provided by native. diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java index 2443d11591c..40c2a51a521 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java @@ -44,6 +44,7 @@ public abstract class View { @Native public final static byte IME_ATTR_TARGET_NOTCONVERTED = 0x03; @Native public final static byte IME_ATTR_INPUT_ERROR = 0x04; + @SuppressWarnings("removal") final static boolean accessible = AccessController.doPrivileged((PrivilegedAction) () -> { String force = System.getProperty("glass.accessible.force"); if (force != null) return Boolean.parseBoolean(force); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java index e1d1a61fb7b..07d7c3a937c 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java @@ -51,6 +51,7 @@ import java.util.concurrent.CountDownLatch; import java.lang.annotation.Native; +@SuppressWarnings("removal") final class GtkApplication extends Application implements InvokeLaterDispatcher.InvokeLaterSubmitter { private static final String SWT_INTERNAL_CLASS = diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java index 4f5d2931b82..3fff7c0b84e 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java @@ -35,6 +35,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; +@SuppressWarnings("removal") public final class IosApplication extends Application { private static native void _initIDs(); // init IDs for java callbacks from native diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java index a240e3a0c1c..c4ed839f363 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java @@ -39,6 +39,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +@SuppressWarnings("removal") final class MacApplication extends Application implements InvokeLaterDispatcher.InvokeLaterSubmitter { private native static void _initIDs(boolean disableSyncRendering); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacCommonDialogs.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacCommonDialogs.java index d1ca041e806..009f863e43a 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacCommonDialogs.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacCommonDialogs.java @@ -69,6 +69,7 @@ static File showFolderChooser_impl(Window owner, String folder, String title) { return _showFolderChooser(ownerPtr, folder, title); } + @SuppressWarnings("removal") static boolean isFileNSURLEnabled() { // The check is dynamic since an app may want to toggle it dynamically. // The performance is not critical for FileChoosers. diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/AndroidInputDeviceRegistry.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/AndroidInputDeviceRegistry.java index 4fd77870cc5..b4b50fe29f7 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/AndroidInputDeviceRegistry.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/AndroidInputDeviceRegistry.java @@ -128,6 +128,7 @@ private AndroidInputDevice addDeviceInternal(AndroidInputDevice device, String n } void removeDevice(AndroidInputDevice device) { + @SuppressWarnings("removal") SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkPermission(new AllPermission()); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/AndroidPlatformFactory.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/AndroidPlatformFactory.java index 44b2ee374bd..b5666a80a97 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/AndroidPlatformFactory.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/AndroidPlatformFactory.java @@ -33,6 +33,7 @@ class AndroidPlatformFactory extends NativePlatformFactory { @Override protected boolean matches() { + @SuppressWarnings("removal") String platform = AccessController.doPrivileged( (PrivilegedAction) () -> System.getProperty("javafx.platform")); return platform != null && platform.equals("android"); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/C.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/C.java index b119b211858..563d380a6d6 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/C.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/C.java @@ -51,6 +51,7 @@ static C getC() { } private static void checkPermissions() { + @SuppressWarnings("removal") SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkPermission(permission); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/DispmanAcceleratedScreen.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/DispmanAcceleratedScreen.java index 499924c2311..5cd8491bddc 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/DispmanAcceleratedScreen.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/DispmanAcceleratedScreen.java @@ -38,9 +38,11 @@ class DispmanAcceleratedScreen extends AcceleratedScreen { @Override protected long platformGetNativeWindow() { + @SuppressWarnings("removal") int displayID = AccessController.doPrivileged( (PrivilegedAction) () -> Integer.getInteger("dispman.display", 0 /* LCD */)); + @SuppressWarnings("removal") int layerID = AccessController.doPrivileged( (PrivilegedAction) () -> Integer.getInteger("dispman.layer", 1)); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EGL.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EGL.java index 489808cc109..9469dc79f88 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EGL.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EGL.java @@ -165,6 +165,7 @@ static EGL getEGL() { } private static void checkPermissions() { + @SuppressWarnings("removal") SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkPermission(permission); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDPlatformFactory.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDPlatformFactory.java index 7e928e9e3e4..b578c36c14c 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDPlatformFactory.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDPlatformFactory.java @@ -72,6 +72,7 @@ class EPDPlatformFactory extends NativePlatformFactory { @Override protected boolean matches() { + @SuppressWarnings("removal") String fbinfo = AccessController.doPrivileged((PrivilegedAction) () -> { String line = null; try (var reader = new BufferedReader(new FileReader(FB_FILE))) { diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDScreen.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDScreen.java index 2caf67aa6f2..93872d35a8a 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDScreen.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDScreen.java @@ -89,6 +89,7 @@ class EPDScreen implements NativeScreen { * * @throws IllegalStateException if an error occurs opening the frame buffer */ + @SuppressWarnings("removal") EPDScreen() { fbPath = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty(FB_PATH_KEY, FB_PATH_DEFAULT)); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDSettings.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDSettings.java index 974bf916f01..266a800766c 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDSettings.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDSettings.java @@ -204,6 +204,7 @@ class EPDSettings { * * @return a new {@code EPDSettings} instance */ + @SuppressWarnings("removal") static EPDSettings newInstance() { return AccessController.doPrivileged( (PrivilegedAction) () -> new EPDSettings()); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDSystem.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDSystem.java index 2b202e4f4ef..2e57f4c130f 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDSystem.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDSystem.java @@ -249,6 +249,7 @@ class EPDSystem { * security manager. */ private static void checkPermissions() { + @SuppressWarnings("removal") SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkPermission(PERMISSION); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/FBDevScreen.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/FBDevScreen.java index 36a81626e37..f41efa3d972 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/FBDevScreen.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/FBDevScreen.java @@ -54,6 +54,7 @@ class FBDevScreen implements NativeScreen { private LinuxFrameBuffer linuxFB; private final String fbDevPath; + @SuppressWarnings("removal") FBDevScreen() { fbDevPath = AccessController.doPrivileged( (PrivilegedAction) () -> diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/HeadlessScreen.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/HeadlessScreen.java index d055bc99d8b..dc160696868 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/HeadlessScreen.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/HeadlessScreen.java @@ -50,6 +50,7 @@ protected HeadlessScreen(int defaultWidth, this.width = defaultWidth; this.height = defaultHeight; this.depth = defaultDepth; + @SuppressWarnings("removal") String geometry = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("headless.geometry")); if (geometry != null && geometry.indexOf('x') > 0) { try { diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/KeyInput.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/KeyInput.java index e66422b5950..f9295aabacd 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/KeyInput.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/KeyInput.java @@ -61,6 +61,7 @@ void getState(KeyState result) { * * @param newState The updated key state */ + @SuppressWarnings("removal") void setState(KeyState newState) { if (MonocleSettings.settings.traceEvents) { MonocleTrace.traceEvent("Set %s", newState); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxArch.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxArch.java index 13c70d15c72..9863f0125c7 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxArch.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxArch.java @@ -28,6 +28,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; +@SuppressWarnings("removal") public class LinuxArch { private static final int bits; diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxInputDeviceRegistry.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxInputDeviceRegistry.java index 7810e025557..9c0aaa0a759 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxInputDeviceRegistry.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxInputDeviceRegistry.java @@ -84,6 +84,7 @@ private LinuxInputDevice createDevice(File devNode, } LinuxInputDevice addDevice(LinuxInputDevice device, String name) { + @SuppressWarnings("removal") SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkPermission(new AllPermission()); @@ -107,6 +108,7 @@ private LinuxInputDevice addDeviceInternal(LinuxInputDevice device, String name) } void removeDevice(LinuxInputDevice device) { + @SuppressWarnings("removal") SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkPermission(new AllPermission()); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxPlatformFactory.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxPlatformFactory.java index 54456fa6785..1fff550e6bb 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxPlatformFactory.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxPlatformFactory.java @@ -32,6 +32,7 @@ class LinuxPlatformFactory extends NativePlatformFactory { @Override protected boolean matches() { + @SuppressWarnings("removal") String os = AccessController.doPrivileged( (PrivilegedAction) () -> System.getProperty("os.name")); return os != null && os.equals("Linux"); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxSystem.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxSystem.java index fc72b517e0f..aa77c1a311d 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxSystem.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxSystem.java @@ -57,6 +57,7 @@ static LinuxSystem getLinuxSystem() { } private static void checkPermissions() { + @SuppressWarnings("removal") SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkPermission(permission); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxTouchProcessor.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxTouchProcessor.java index 06531aba460..53caace2bd5 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxTouchProcessor.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxTouchProcessor.java @@ -34,6 +34,7 @@ abstract class LinuxTouchProcessor implements LinuxInputProcessor { final TouchPipeline pipeline; final LinuxTouchTransform transform; + @SuppressWarnings("removal") LinuxTouchProcessor(LinuxInputDevice device) { transform = new LinuxTouchTransform(device); PrivilegedAction getFilterProperty = diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxTouchTransform.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxTouchTransform.java index 1a2633d3b39..d0d75653430 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxTouchTransform.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxTouchTransform.java @@ -52,6 +52,7 @@ class LinuxTouchTransform { private int[] mins = new int[2]; private int[] maxs = new int[2]; + @SuppressWarnings("removal") LinuxTouchTransform(LinuxInputDevice device) { this.device = device; Arrays.fill(axes, -1); @@ -113,6 +114,7 @@ int getAxis(LinuxEventBuffer buffer) { } } + @SuppressWarnings("removal") private void initTransform(int axis, int index) { double range; String axisName; diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java index b9f6f7a22ab..88e539733d7 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java @@ -111,6 +111,7 @@ private void updateDeviceFlags(InputDevice device, boolean added) { @Override protected void runLoop(Runnable launchable) { runnableProcessor.invokeLater(launchable); + @SuppressWarnings("removal") long stackSize = AccessController.doPrivileged( (PrivilegedAction) () -> Long.getLong("monocle.stackSize", 0)); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/MonocleSettings.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/MonocleSettings.java index bced18f8f2c..8905f1b9cd0 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/MonocleSettings.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/MonocleSettings.java @@ -30,6 +30,7 @@ class MonocleSettings { + @SuppressWarnings("removal") static final MonocleSettings settings = AccessController.doPrivileged( (PrivilegedAction) () -> new MonocleSettings()); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/NativePlatform.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/NativePlatform.java index ac6e43279c7..7bd919aa0bb 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/NativePlatform.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/NativePlatform.java @@ -46,6 +46,7 @@ public abstract class NativePlatform { protected AcceleratedScreen accScreen; + @SuppressWarnings("removal") protected static final boolean useCursor = AccessController.doPrivileged((PrivilegedAction) () -> { final String str = diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/NativePlatformFactory.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/NativePlatformFactory.java index a960ec1167d..a2ac6d8da11 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/NativePlatformFactory.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/NativePlatformFactory.java @@ -81,6 +81,7 @@ public abstract class NativePlatformFactory { */ public static synchronized NativePlatform getNativePlatform() { if (platform == null) { + @SuppressWarnings("removal") String platformFactoryProperty = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("monocle.platform", "MX6,OMAP,Dispman,Android,X11,Linux,Headless")); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/TouchInput.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/TouchInput.java index 653db666aed..ca51ad3c49d 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/TouchInput.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/TouchInput.java @@ -46,6 +46,7 @@ class TouchInput { * events with a delta smaller then the value of this property will be * filtered out.The value of the property is in pixels. */ + @SuppressWarnings("removal") private final int touchRadius = AccessController.doPrivileged( (PrivilegedAction) () -> Integer.getInteger( "monocle.input.touchRadius", 20) @@ -70,6 +71,7 @@ private TouchInput() { TouchPipeline getBasePipeline() { if (basePipeline == null) { basePipeline = new TouchPipeline(); + @SuppressWarnings("removal") String[] touchFilterNames = AccessController.doPrivileged( (PrivilegedAction) () -> System.getProperty( "monocle.input.touchFilters", diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/VNCScreen.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/VNCScreen.java index 3555110b779..bd3cfbc9936 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/VNCScreen.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/VNCScreen.java @@ -54,6 +54,7 @@ class VNCScreen extends HeadlessScreen { super(1024, 600, 32); try { server = ServerSocketChannel.open(); + @SuppressWarnings("removal") int vncPort = AccessController.doPrivileged( (PrivilegedAction) () -> Integer.getInteger("vnc.port", 5901)); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X.java index 6eda9f69bb5..7005ae59e5a 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X.java @@ -56,6 +56,7 @@ static X getX() { } private static void checkPermissions() { + @SuppressWarnings("removal") SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkPermission(permission); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11AcceleratedScreen.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11AcceleratedScreen.java index 47a02537927..9b56b94ccd9 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11AcceleratedScreen.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11AcceleratedScreen.java @@ -51,6 +51,7 @@ protected long platformGetNativeDisplay() { * This workaround can be removed when the bug in the drivers is fixed. */ if (nativeDisplay == null) { + @SuppressWarnings("removal") boolean doMaliWorkaround = AccessController.doPrivileged( (PrivilegedAction) () -> diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11Platform.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11Platform.java index df4b4e916f8..96ccdc0e07a 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11Platform.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11Platform.java @@ -35,6 +35,7 @@ class X11Platform extends NativePlatform { private final boolean x11Input; + @SuppressWarnings("removal") X11Platform() { LinuxSystem.getLinuxSystem().loadLibrary(); x11Input = AccessController.doPrivileged((PrivilegedAction) diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11PlatformFactory.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11PlatformFactory.java index 4fd3786807f..56e98d187ba 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11PlatformFactory.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11PlatformFactory.java @@ -35,6 +35,7 @@ class X11PlatformFactory extends NativePlatformFactory { @Override protected boolean matches() { + @SuppressWarnings("removal") String display = AccessController.doPrivileged( (PrivilegedAction) () -> System.getenv("DISPLAY")); return display != null; diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11Screen.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11Screen.java index 50101365322..c9ecbeef048 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11Screen.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/X11Screen.java @@ -74,6 +74,7 @@ class X11Screen implements NativeScreen { int w = xLib.WidthOfScreen(screen); int h = xLib.HeightOfScreen(screen); boolean fullScreen = true; + @SuppressWarnings("removal") String geometry = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("x11.geometry")); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java index c4e6b0d5ac0..fbe7669b377 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java @@ -36,6 +36,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; +@SuppressWarnings("removal") final class WinApplication extends Application implements InvokeLaterDispatcher.InvokeLaterSubmitter { static float overrideUIScale; diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java b/modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java index 99610c09c00..8a9b460ece7 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java @@ -41,6 +41,7 @@ import java.util.List; import java.util.Locale; +@SuppressWarnings("removal") public class NativeLibLoader { private static final HashSet loaded = new HashSet(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java index 4d2a0074103..c575f951112 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java @@ -56,6 +56,7 @@ import com.sun.javafx.stage.StageHelper; +@SuppressWarnings("removal") public class LauncherImpl { /** * When passed as launchMode to launchApplication, tells the method that diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java index c16b7dfdbad..2cbb6090fba 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java @@ -95,10 +95,12 @@ public class PlatformImpl { private static BooleanProperty accessibilityActive = new SimpleBooleanProperty(); private static CountDownLatch allNestedLoopsExitedLatch = new CountDownLatch(1); + @SuppressWarnings("removal") private static final boolean verbose = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.verbose")); + @SuppressWarnings("removal") private static final boolean DEBUG = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("com.sun.javafx.application.debug")); @@ -170,6 +172,7 @@ public static void startup(final Runnable r) { * @param r * @param preventDuplicateCalls */ + @SuppressWarnings("removal") public static void startup(final Runnable r, boolean preventDuplicateCalls) { // NOTE: if we ever support re-launching an application and/or @@ -301,6 +304,7 @@ private static void initDeviceDetailsFXCanvas() { // Read the javafx.embed.eventProc system property and store // it in an entry in the glass Application device details map final String eventProcProperty = "javafx.embed.eventProc"; + @SuppressWarnings("removal") final long eventProc = AccessController.doPrivileged((PrivilegedAction) () -> Long.getLong(eventProcProperty, 0)); if (eventProc != 0L) { @@ -344,6 +348,7 @@ private static void addExportsToFXCanvas(Class fxCanvasClass) { // FXCanvas-specific initialization private static void initFXCanvas() { // Verify that we have the appropriate permission + @SuppressWarnings("removal") final SecurityManager sm = System.getSecurityManager(); if (sm != null) { try { @@ -360,6 +365,7 @@ private static void initFXCanvas() { !f.getClassName().startsWith("javafx.application.") && !f.getClassName().startsWith("com.sun.javafx.application."); + @SuppressWarnings("removal") final StackWalker walker = AccessController.doPrivileged((PrivilegedAction) () -> StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE)); Optional frame = walker.walk( @@ -424,6 +430,7 @@ public static void runLater(final Runnable r) { runLater(r, false); } + @SuppressWarnings("removal") private static void runLater(final Runnable r, boolean exiting) { if (!initialized.get()) { throw new IllegalStateException("Toolkit not initialized"); @@ -648,6 +655,7 @@ public static boolean isSupported(ConditionalFeature feature) { // some features require the application to have the corresponding // permissions, if the application doesn't have them, the platform // will behave as if the feature wasn't supported + @SuppressWarnings("removal") final SecurityManager securityManager = System.getSecurityManager(); if (securityManager != null) { @@ -736,6 +744,7 @@ public static boolean setAccessibilityTheme(String platformTheme) { private static void _setAccessibilityTheme(String platformTheme) { // check to see if there is an override to enable a high-contrast theme + @SuppressWarnings("removal") final String userTheme = AccessController.doPrivileged( (PrivilegedAction) () -> System.getProperty("com.sun.javafx.highContrastTheme")); @@ -780,6 +789,7 @@ private static void _setAccessibilityTheme(String platformTheme) { } } + @SuppressWarnings("removal") private static void _setPlatformUserAgentStylesheet(String stylesheetUrl) { isModena = isCaspian = false; // check for command line override @@ -871,6 +881,7 @@ private static void _setPlatformUserAgentStylesheet(String stylesheetUrl) { } + @SuppressWarnings("removal") public static void addNoTransparencyStylesheetToScene(final Scene scene) { if (PlatformImpl.isCaspian()) { AccessController.doPrivileged((PrivilegedAction) () -> { @@ -887,6 +898,7 @@ public static void addNoTransparencyStylesheetToScene(final Scene scene) { } } + @SuppressWarnings("removal") private static boolean isSupportedImpl(ConditionalFeature feature) { switch (feature) { case GRAPHICS: diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/StyleManager.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/StyleManager.java index c68036bd098..a20e36d527c 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/StyleManager.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/StyleManager.java @@ -939,6 +939,7 @@ static byte[] calculateCheckSum(String fname) { return new byte[0]; } + @SuppressWarnings("removal") public static Stylesheet loadStylesheet(final String fname) { try { return loadStylesheetUnPrivileged(fname); @@ -1065,6 +1066,7 @@ public static Stylesheet loadStylesheet(final String fname) { private static Stylesheet loadStylesheetUnPrivileged(final String fname) { synchronized (styleLock) { + @SuppressWarnings("removal") Boolean parse = AccessController.doPrivileged((PrivilegedAction) () -> { final String bss = System.getProperty("binary.css"); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/AndroidFontFinder.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/AndroidFontFinder.java index 2bd48cdd35d..64e9c236403 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/AndroidFontFinder.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/AndroidFontFinder.java @@ -53,6 +53,7 @@ * defines some basic mappings based on best guess which fonts are mandatory on * platforms lower than 4.0 and how they map to typefaces. */ +@SuppressWarnings("removal") class AndroidFontFinder { private final static String SYSTEM_FONT_NAME = "sans serif"; diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java index e36bcef454d..b8c23cd8395 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java @@ -31,6 +31,7 @@ import com.sun.glass.utils.NativeLibLoader; +@SuppressWarnings("removal") class DFontDecoder extends FontFileWriter { static { AccessController.doPrivileged((PrivilegedAction) () -> { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/Disposer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/Disposer.java index c65ba5bd896..2986cac7abf 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/Disposer.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/Disposer.java @@ -43,6 +43,7 @@ * * @see DisposerRecord */ +@SuppressWarnings("removal") public class Disposer implements Runnable { private static final ReferenceQueue queue = new ReferenceQueue(); private static final Hashtable records = new Hashtable(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java index 1c511d52bac..4340d32ad78 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java @@ -36,6 +36,7 @@ import java.util.Locale; import java.util.Properties; +@SuppressWarnings("removal") class FontConfigManager { static boolean debugFonts = false; diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontFileReader.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontFileReader.java index 781662851ea..fb9a6270b19 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontFileReader.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontFileReader.java @@ -54,6 +54,7 @@ public String getFilename() { * already or if it failed to open the file. * @throws PrivilegedActionException */ + @SuppressWarnings("removal") public synchronized boolean openFile() throws PrivilegedActionException { if (raFile != null) { return false; diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontFileWriter.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontFileWriter.java index d10b92fd4b3..115b3e3b25e 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontFileWriter.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontFileWriter.java @@ -80,6 +80,7 @@ public File getFile() { return file; } + @SuppressWarnings("removal") public File openFile() throws PrivilegedActionException { pos = 0; writtenBytes = 0; @@ -123,6 +124,7 @@ public void closeFile() throws IOException { } } + @SuppressWarnings("removal") public void deleteFile() { if (file != null) { if (tracker != null) { @@ -252,6 +254,7 @@ public void writeBytes(byte[] buffer, int startPos, int length) * If a thread can create temp files anyway, there is no point in counting * font bytes. */ + @SuppressWarnings("removal") static boolean hasTempPermission() { if (System.getSecurityManager() == null) { return true; @@ -342,6 +345,7 @@ private static class TempFileDeletionHook { new HashMap(); private static Thread t = null; + @SuppressWarnings("removal") static void init() { if (t == null) { // Add a shutdown hook to remove the temp file. diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/MacFontFinder.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/MacFontFinder.java index ae9c753c10c..ceaac1e8254 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/MacFontFinder.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/MacFontFinder.java @@ -33,6 +33,7 @@ import com.sun.glass.utils.NativeLibLoader; +@SuppressWarnings("removal") class MacFontFinder { static { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java index 3717d741a45..7e5d291811b 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java @@ -46,6 +46,7 @@ import com.sun.javafx.text.GlyphLayout; import static com.sun.javafx.FXPermissions.LOAD_FONT_PERMISSION; +@SuppressWarnings("removal") public abstract class PrismFontFactory implements FontFactory { public static final boolean debugFonts; diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFile.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFile.java index 28230664f06..270e98de338 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFile.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFile.java @@ -117,6 +117,7 @@ void setIsDecoded(boolean decoded) { /* This is called only for fonts where a temp file was created */ + @SuppressWarnings("removal") protected synchronized void disposeOnShutdown() { if (isCopy || isDecoded) { AccessController.doPrivileged( @@ -227,6 +228,7 @@ public void setFactory(PrismFontFactory factory, this.refKey = refKey; } + @SuppressWarnings("removal") public synchronized void dispose() { if (fileName != null) { AccessController.doPrivileged( diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/OS.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/OS.java index 8be00f0341e..169d782cbaa 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/OS.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/OS.java @@ -32,6 +32,7 @@ import com.sun.glass.utils.NativeLibLoader; import com.sun.javafx.geom.Path2D; +@SuppressWarnings("removal") class OS { static { AccessController.doPrivileged((PrivilegedAction) () -> { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java index 811723b2de2..a9fa709c73c 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java @@ -31,6 +31,7 @@ import com.sun.glass.utils.NativeLibLoader; import com.sun.javafx.geom.Path2D; +@SuppressWarnings("removal") class OS { static { AccessController.doPrivileged((PrivilegedAction) () -> { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSFreetype.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSFreetype.java index b8d6a8971c6..890066f457a 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSFreetype.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSFreetype.java @@ -30,6 +30,7 @@ import com.sun.glass.utils.NativeLibLoader; import com.sun.javafx.geom.Path2D; +@SuppressWarnings("removal") class OSFreetype { static { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSPango.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSPango.java index 9dcdacc6e69..4ac761d5bd4 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSPango.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSPango.java @@ -29,6 +29,7 @@ import java.security.PrivilegedAction; import com.sun.glass.utils.NativeLibLoader; +@SuppressWarnings("removal") class OSPango { static { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java index 7f59d6bfda9..a13386c23aa 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java @@ -47,6 +47,7 @@ /** * A loader for images on iOS platform. */ +@SuppressWarnings("removal") public class IosImageLoader extends ImageLoaderImpl { /** These constants must match with those in native */ diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java index 82f61f26b38..0970450056a 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java @@ -37,6 +37,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; +@SuppressWarnings("removal") public class JPEGImageLoader extends ImageLoaderImpl { // IJG Color codes. diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java index 064c7cc688c..caf3388524e 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java @@ -130,6 +130,7 @@ public static void notifyScaleChanged(final Window window, windowAccessor.notifyScaleChanged(window, newOutputScaleX, newOutputScaleY); } + @SuppressWarnings("removal") static AccessControlContext getAccessControlContext(Window window) { return windowAccessor.getAccessControlContext(window); } @@ -169,6 +170,7 @@ public interface WindowAccessor { ReadOnlyObjectProperty screenProperty(Window window); + @SuppressWarnings("removal") AccessControlContext getAccessControlContext(Window window); } } diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/DummyToolkit.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/DummyToolkit.java index e190b191bbd..84145ce2c3d 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/DummyToolkit.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/DummyToolkit.java @@ -103,17 +103,17 @@ public void exitAllNestedEventLoops() { } @Override - public TKStage createTKStage(Window peerWindow, boolean securityDialog, StageStyle stageStyle, boolean primary, Modality modality, TKStage owner, boolean rtl, AccessControlContext acc) { + public TKStage createTKStage(Window peerWindow, boolean securityDialog, StageStyle stageStyle, boolean primary, Modality modality, TKStage owner, boolean rtl, @SuppressWarnings("removal") AccessControlContext acc) { throw new UnsupportedOperationException("Not supported yet."); } @Override - public TKStage createTKPopupStage(Window peerWindow, StageStyle popupStyle, TKStage owner, AccessControlContext acc) { + public TKStage createTKPopupStage(Window peerWindow, StageStyle popupStyle, TKStage owner, @SuppressWarnings("removal") AccessControlContext acc) { throw new UnsupportedOperationException("Not supported yet."); } @Override - public TKStage createTKEmbeddedStage(HostInterface host, AccessControlContext acc) { + public TKStage createTKEmbeddedStage(HostInterface host, @SuppressWarnings("removal") AccessControlContext acc) { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/LocalClipboard.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/LocalClipboard.java index e30bb472aca..4db799f6963 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/LocalClipboard.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/LocalClipboard.java @@ -44,7 +44,7 @@ public LocalClipboard() { } @Override - public void setSecurityContext(final AccessControlContext ctx) { + public void setSecurityContext(@SuppressWarnings("removal") final AccessControlContext ctx) { // ctx not needed } diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/PermissionHelper.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/PermissionHelper.java index 1c41965835c..919e0939504 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/PermissionHelper.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/PermissionHelper.java @@ -62,6 +62,7 @@ private static synchronized Permission getAWTClipboardPermission() { } public static void checkClipboardPermission() { + @SuppressWarnings("removal") final SecurityManager securityManager = System.getSecurityManager(); // Always succeed if no security manager installed @@ -84,6 +85,7 @@ public static void checkClipboardPermission() { } } + @SuppressWarnings("removal") public static void checkClipboardPermission(AccessControlContext context) { final SecurityManager securityManager = System.getSecurityManager(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKClipboard.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKClipboard.java index 9f64658e505..ea0769a864b 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKClipboard.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKClipboard.java @@ -43,7 +43,7 @@ public interface TKClipboard { /** * This method is used to set security context of the Stage. */ - public void setSecurityContext(AccessControlContext ctx); + public void setSecurityContext(@SuppressWarnings("removal") AccessControlContext ctx); /** * Gets the set of DataFormat types on this Clipboard instance which have diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKScene.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKScene.java index b488794f2b6..0f2c82d6813 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKScene.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKScene.java @@ -87,5 +87,6 @@ public interface TKScene { public TKClipboard createDragboard(boolean isDragSource); + @SuppressWarnings("removal") public AccessControlContext getAccessControlContext(); } diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKStage.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKStage.java index 324d4bb2716..540c2055a5a 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKStage.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKStage.java @@ -47,7 +47,7 @@ public interface TKStage { * * @return scenePeer The peer of the scene to be displayed */ - public TKScene createTKScene(boolean depthBuffer, boolean msaa, AccessControlContext acc); + public TKScene createTKScene(boolean depthBuffer, boolean msaa, @SuppressWarnings("removal") AccessControlContext acc); /** * Set the scene to be displayed in this stage diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java index 1ea650f0bdb..bb77f6e21be 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java @@ -107,6 +107,7 @@ public abstract class Toolkit { private static final Map gradientMap = new WeakHashMap(); + @SuppressWarnings("removal") private static final boolean verbose = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.verbose")); private static final String[] msLibNames = { @@ -197,6 +198,7 @@ private static String getDefaultToolkit() { throw new UnsupportedOperationException(System.getProperty("os.name") + " is not supported"); } + @SuppressWarnings("removal") public static synchronized Toolkit getToolkit() { if (TOOLKIT != null) { return TOOLKIT; @@ -368,10 +370,10 @@ protected Toolkit() { public abstract boolean isNestedLoopRunning(); - public abstract TKStage createTKStage(Window peerWindow, boolean securityDialog, StageStyle stageStyle, boolean primary, Modality modality, TKStage owner, boolean rtl, AccessControlContext acc); + public abstract TKStage createTKStage(Window peerWindow, boolean securityDialog, StageStyle stageStyle, boolean primary, Modality modality, TKStage owner, boolean rtl, @SuppressWarnings("removal") AccessControlContext acc); - public abstract TKStage createTKPopupStage(Window peerWindow, StageStyle popupStyle, TKStage owner, AccessControlContext acc); - public abstract TKStage createTKEmbeddedStage(HostInterface host, AccessControlContext acc); + public abstract TKStage createTKPopupStage(Window peerWindow, StageStyle popupStyle, TKStage owner, @SuppressWarnings("removal") AccessControlContext acc); + public abstract TKStage createTKEmbeddedStage(HostInterface host, @SuppressWarnings("removal") AccessControlContext acc); /** * Creates an AppletWindow using the provided window pointer as the parent @@ -391,18 +393,23 @@ protected Toolkit() { */ public abstract void closeAppletWindow(); + @SuppressWarnings("removal") private final Map stagePulseListeners = new WeakHashMap(); + @SuppressWarnings("removal") private final Map scenePulseListeners = new WeakHashMap(); + @SuppressWarnings("removal") private final Map postScenePulseListeners = new WeakHashMap(); + @SuppressWarnings("removal") private final Map toolkitListeners = new WeakHashMap(); // The set of shutdown hooks is strongly held to avoid premature GC. private final Set shutdownHooks = new HashSet(); + @SuppressWarnings("removal") private void runPulse(final TKPulseListener listener, final AccessControlContext acc) { @@ -421,10 +428,13 @@ public void firePulse() { // and those changes propogated to scene before it gets its pulse to update // Copy of listener map + @SuppressWarnings("removal") final Map stagePulseList = new WeakHashMap(); + @SuppressWarnings("removal") final Map scenePulseList = new WeakHashMap(); + @SuppressWarnings("removal") final Map postScenePulseList = new WeakHashMap(); @@ -433,13 +443,13 @@ public void firePulse() { scenePulseList.putAll(scenePulseListeners); postScenePulseList.putAll(postScenePulseListeners); } - for (Map.Entry entry : stagePulseList.entrySet()) { + for (@SuppressWarnings("removal") Map.Entry entry : stagePulseList.entrySet()) { runPulse(entry.getKey(), entry.getValue()); } - for (Map.Entry entry : scenePulseList.entrySet()) { + for (@SuppressWarnings("removal") Map.Entry entry : scenePulseList.entrySet()) { runPulse(entry.getKey(), entry.getValue()); } - for (Map.Entry entry : postScenePulseList.entrySet()) { + for (@SuppressWarnings("removal") Map.Entry entry : postScenePulseList.entrySet()) { runPulse(entry.getKey(), entry.getValue()); } @@ -452,6 +462,7 @@ public void addStageTkPulseListener(TKPulseListener listener) { return; } synchronized (this) { + @SuppressWarnings("removal") AccessControlContext acc = AccessController.getContext(); stagePulseListeners.put(listener, acc); } @@ -466,6 +477,7 @@ public void addSceneTkPulseListener(TKPulseListener listener) { return; } synchronized (this) { + @SuppressWarnings("removal") AccessControlContext acc = AccessController.getContext(); scenePulseListeners.put(listener, acc); } @@ -480,6 +492,7 @@ public void addPostSceneTkPulseListener(TKPulseListener listener) { return; } synchronized (this) { + @SuppressWarnings("removal") AccessControlContext acc = AccessController.getContext(); postScenePulseListeners.put(listener, acc); } @@ -494,6 +507,7 @@ public void addTkListener(TKListener listener) { if (listener == null) { return; } + @SuppressWarnings("removal") AccessControlContext acc = AccessController.getContext(); toolkitListeners.put(listener, acc); } @@ -503,7 +517,9 @@ public void removeTkListener(TKListener listener) { } private TKPulseListener lastTkPulseListener = null; + @SuppressWarnings("removal") private AccessControlContext lastTkPulseAcc = null; + @SuppressWarnings("removal") public void setLastTkPulseListener(TKPulseListener listener) { lastTkPulseAcc = AccessController.getContext(); lastTkPulseListener = listener; @@ -536,6 +552,7 @@ protected void notifyShutdownHooks() { } } + @SuppressWarnings("removal") public void notifyWindowListeners(final List windows) { for (Map.Entry entry : toolkitListeners.entrySet()) { final TKListener listener = entry.getKey(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java index d7766fd6999..c622ed7a83f 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java @@ -199,6 +199,7 @@ public boolean traverseOut(Direction dir) { return false; } + @SuppressWarnings("removal") @Override public void setSize(final int width, final int height) { Platform.runLater(() -> { @@ -268,6 +269,7 @@ protected Color getClearColor() { return super.getClearColor(); } + @SuppressWarnings("removal") @Override public void mouseEvent(final int type, final int button, final boolean primaryBtnDown, final boolean middleBtnDown, final boolean secondaryBtnDown, @@ -296,6 +298,7 @@ public void mouseEvent(final int type, final int button, }); } + @SuppressWarnings("removal") @Override public void scrollEvent(final int type, final double scrollX, final double scrollY, @@ -319,6 +322,7 @@ public void scrollEvent(final int type, } } + @SuppressWarnings("removal") @Override public void inputMethodEvent(final EventType type, final ObservableList composed, final String committed, @@ -333,6 +337,7 @@ public void inputMethodEvent(final EventType type, }); } + @SuppressWarnings("removal") @Override public void menuEvent(final int x, final int y, final int xAbs, final int yAbs, final boolean isKeyboardTrigger) { Platform.runLater(() -> { @@ -345,6 +350,7 @@ public void menuEvent(final int x, final int y, final int xAbs, final int yAbs, }); } + @SuppressWarnings("removal") @Override public void keyEvent(final int type, final int key, final char[] ch, final int modifiers) { Platform.runLater(() -> { @@ -369,6 +375,7 @@ public void keyEvent(final int type, final int key, final char[] ch, final int m }); } + @SuppressWarnings("removal") @Override public void zoomEvent(final int type, final double zoomFactor, final double totalZoomFactor, final double x, final double y, final double screenX, final double screenY, @@ -388,6 +395,7 @@ public void zoomEvent(final int type, final double zoomFactor, final double tota }); } + @SuppressWarnings("removal") @Override public void rotateEvent(final int type, final double angle, final double totalAngle, final double x, final double y, final double screenX, final double screenY, @@ -407,6 +415,7 @@ public void rotateEvent(final int type, final double angle, final double totalAn }); } + @SuppressWarnings("removal") @Override public void swipeEvent(final int type, final double x, final double y, final double screenX, final double screenY, boolean shift, boolean ctrl, boolean alt, boolean meta) diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java index ae02d476c4d..16d308f41f5 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java @@ -48,7 +48,7 @@ public EmbeddedStage(HostInterface host) { // TKStage methods @Override - public TKScene createTKScene(boolean depthBuffer, boolean msaa, AccessControlContext acc) { + public TKScene createTKScene(boolean depthBuffer, boolean msaa, @SuppressWarnings("removal") AccessControlContext acc) { EmbeddedScene scene = new EmbeddedScene(host, depthBuffer, msaa); scene.setSecurityContext(acc); return scene; @@ -220,6 +220,7 @@ public void toFront() { host.ungrabFocus(); } + @SuppressWarnings("removal") private void notifyStageListener(final Runnable r) { AccessControlContext acc = getAccessControlContext(); AccessController.doPrivileged((PrivilegedAction) () -> { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassScene.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassScene.java index 0ede5b58bd1..6bc74c193a3 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassScene.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassScene.java @@ -75,6 +75,7 @@ abstract class GlassScene implements TKScene { SceneState sceneState; + @SuppressWarnings("removal") private AccessControlContext accessCtrlCtx = null; protected GlassScene(boolean depthBuffer, boolean msaa) { @@ -99,6 +100,7 @@ public void dispose() { } // To be used by subclasses to enforce context check + @SuppressWarnings("removal") @Override public final AccessControlContext getAccessControlContext() { if (accessCtrlCtx == null) { @@ -107,6 +109,7 @@ public final AccessControlContext getAccessControlContext() { return accessCtrlCtx; } + @SuppressWarnings("removal") public final void setSecurityContext(AccessControlContext ctx) { if (accessCtrlCtx != null) { throw new RuntimeException("Scene security context has been already set!"); @@ -239,6 +242,7 @@ public void clearEntireSceneDirty() { @Override public TKClipboard createDragboard(boolean isDragSource) { + @SuppressWarnings("removal") ClipboardAssistance assistant = new ClipboardAssistance(Clipboard.DND) { @Override public void actionPerformed(final int performedAction) { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java index fe9d8d92eb0..618db76e29c 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java @@ -68,6 +68,7 @@ private double getPlatformScaleY() { return 1.0; } + @SuppressWarnings("removal") public TransferMode handleDragEnter(final int x, final int y, final int xAbs, final int yAbs, final TransferMode recommendedTransferMode, final ClipboardAssistance dropTargetAssistant) @@ -86,6 +87,7 @@ public TransferMode handleDragEnter(final int x, final int y, final int xAbs, fi }, scene.getAccessControlContext()); } + @SuppressWarnings("removal") public void handleDragLeave(final ClipboardAssistance dropTargetAssistant) { assert Platform.isFxApplicationThread(); AccessController.doPrivileged((PrivilegedAction) () -> { @@ -96,6 +98,7 @@ public void handleDragLeave(final ClipboardAssistance dropTargetAssistant) { }, scene.getAccessControlContext()); } + @SuppressWarnings("removal") public TransferMode handleDragDrop(final int x, final int y, final int xAbs, final int yAbs, final TransferMode recommendedTransferMode, final ClipboardAssistance dropTargetAssistant) @@ -112,6 +115,7 @@ public TransferMode handleDragDrop(final int x, final int y, final int xAbs, fin }, scene.getAccessControlContext()); } + @SuppressWarnings("removal") public TransferMode handleDragOver(final int x, final int y, final int xAbs, final int yAbs, final TransferMode recommendedTransferMode, final ClipboardAssistance dropTargetAssistant) @@ -134,6 +138,7 @@ public TransferMode handleDragOver(final int x, final int y, final int xAbs, fin // detected. This mechanism is currently not used in FX, as we have // a custom gesture recognizer in Scene, and DnD is started with // Toolkit.startDrag(). + @SuppressWarnings("removal") public void handleDragStart(final int button, final int x, final int y, final int xAbs, final int yAbs, final ClipboardAssistance dragSourceAssistant) { @@ -154,6 +159,7 @@ public void handleDragStart(final int button, final int x, final int y, final in // This is a callback from the native platform, when the drag was started // from handleDragStart() above, or when FX as a drag source is embedded // to Swing/SWT. + @SuppressWarnings("removal") public void handleDragEnd(final TransferMode performedTransferMode, final ClipboardAssistance dragSourceAssistant) { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassStage.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassStage.java index 9bba6643709..cd710c4a327 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassStage.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassStage.java @@ -57,6 +57,7 @@ abstract class GlassStage implements TKStage { private boolean important = true; + @SuppressWarnings("removal") private AccessControlContext accessCtrlCtx = null; protected static final AtomicReference activeFSWindow = new AtomicReference<>(); @@ -96,6 +97,7 @@ protected final GlassScene getScene() { } // To be used by subclasses to enforce context check + @SuppressWarnings("removal") final AccessControlContext getAccessControlContext() { if (accessCtrlCtx == null) { throw new RuntimeException("Stage security context has not been set!"); @@ -103,6 +105,7 @@ final AccessControlContext getAccessControlContext() { return accessCtrlCtx; } + @SuppressWarnings("removal") static AccessControlContext doIntersectionPrivilege(PrivilegedAction action, AccessControlContext stack, AccessControlContext context) { @@ -113,6 +116,7 @@ static AccessControlContext doIntersectionPrivilege(PrivilegedAction { @@ -166,6 +167,7 @@ public void handleLevelEvent(int level) { }); } + @SuppressWarnings("removal") @Override public void handleWindowEvent(final Window window, final long time, final int type) { this.window = window; @@ -177,6 +179,7 @@ public void handleWindowEvent(final Window window, final long time, final int ty }); } + @SuppressWarnings("removal") @Override public void handleScreenChangedEvent(Window window, long time, Screen oldScreen, Screen newScreen) { GlassScene scene = stage.getScene(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceLogger.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceLogger.java index 1f0d41baab6..02cac990220 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceLogger.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceLogger.java @@ -73,6 +73,7 @@ * Note: This file a copy for sun.misc.PerformanceLogger before it was moved to * sun.awt.util and JavaFX do not want to be dependent on awt if possible. */ +@SuppressWarnings("removal") public class PerformanceLogger { // Timing values of global interest diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceTrackerHelper.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceTrackerHelper.java index 693fc9304cf..b05c47d8e4e 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceTrackerHelper.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceTrackerHelper.java @@ -46,6 +46,7 @@ private PerformanceTrackerHelper() { } private static PerformanceTrackerHelper createInstance() { + @SuppressWarnings("removal") PerformanceTrackerHelper trackerImpl = AccessController.doPrivileged( new PrivilegedAction() { @@ -129,6 +130,7 @@ private void logLaunchTime() { // Attempt to log launchTime, if not set already if (PerformanceLogger.getStartTime() <= 0) { // Standalone apps record launch time as sysprop + @SuppressWarnings("removal") String launchTimeString = AccessController.doPrivileged( (PrivilegedAction) () -> System.getProperty("launchTime")); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PrismImageLoader2.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PrismImageLoader2.java index 7231342981b..d71339f7db3 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PrismImageLoader2.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PrismImageLoader2.java @@ -228,12 +228,14 @@ static final class AsyncImageLoader private static final ExecutorService BG_LOADING_EXECUTOR = createExecutor(); + @SuppressWarnings("removal") private final AccessControlContext acc; double width, height; boolean preserveRatio; boolean smooth; + @SuppressWarnings("removal") public AsyncImageLoader( AsyncOperationListener listener, String url, @@ -252,6 +254,7 @@ protected PrismImageLoader2 processStream(InputStream stream) throws IOException return new PrismImageLoader2(stream, width, height, preserveRatio, smooth); } + @SuppressWarnings("removal") @Override public PrismImageLoader2 call() throws IOException { try { @@ -274,6 +277,7 @@ public void start() { } private static ExecutorService createExecutor() { + @SuppressWarnings("removal") final ThreadGroup bgLoadingThreadGroup = AccessController.doPrivileged( (PrivilegedAction) () -> new ThreadGroup( @@ -282,6 +286,7 @@ private static ExecutorService createExecutor() { "Background image loading thread pool") ); + @SuppressWarnings("removal") final ThreadFactory bgLoadingThreadFactory = runnable -> AccessController.doPrivileged( (PrivilegedAction) () -> { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumClipboard.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumClipboard.java index e0c0906e411..7ca53f17f75 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumClipboard.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumClipboard.java @@ -85,6 +85,7 @@ final class QuantumClipboard implements TKClipboard { * javafx.scene.input.Clipboard * ... user code ... */ + @SuppressWarnings("removal") private AccessControlContext accessContext = null; /** @@ -126,13 +127,14 @@ final class QuantumClipboard implements TKClipboard { private QuantumClipboard() { } - @Override public void setSecurityContext(AccessControlContext acc) { + @Override public void setSecurityContext(@SuppressWarnings("removal") AccessControlContext acc) { if (accessContext != null) { throw new RuntimeException("Clipboard security context has been already set!"); } accessContext = acc; } + @SuppressWarnings("removal") private AccessControlContext getAccessControlContext() { if (accessContext == null) { throw new RuntimeException("Clipboard security context has not been set!"); @@ -371,8 +373,10 @@ private Image readImage() { String url = parseIMG(htmlData); if (url != null) { try { + @SuppressWarnings("removal") SecurityManager sm = System.getSecurityManager(); if (sm != null) { + @SuppressWarnings("removal") AccessControlContext context = getAccessControlContext(); URL u = new URL(url); String protocol = u.getProtocol(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumRenderer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumRenderer.java index 0044bae48c0..5fd79d94cb2 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumRenderer.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumRenderer.java @@ -55,6 +55,7 @@ * Quantum Renderer */ final class QuantumRenderer extends ThreadPoolExecutor { + @SuppressWarnings("removal") private static boolean usePurgatory = // TODO - deprecate AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("decora.purgatory")); @@ -132,6 +133,7 @@ public void cleanup() { private class QuantumThreadFactory implements ThreadFactory { final AtomicInteger threadNumber = new AtomicInteger(0); + @SuppressWarnings("removal") @Override public Thread newThread(Runnable r) { final PipelineRunnable pipeline = new PipelineRunnable(r); _renderer = @@ -191,6 +193,7 @@ protected void disposePresentable(final Presentable presentable) { } } + @SuppressWarnings("removal") protected void stopRenderer() { AccessController.doPrivileged((PrivilegedAction) () -> { shutdown(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java index 4dd5d54c81b..7e8b6f01e08 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java @@ -137,12 +137,15 @@ public final class QuantumToolkit extends Toolkit { + @SuppressWarnings("removal") public static final boolean verbose = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("quantum.verbose")); + @SuppressWarnings("removal") public static final boolean pulseDebug = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("quantum.pulse")); + @SuppressWarnings("removal") private static final boolean multithreaded = AccessController.doPrivileged((PrivilegedAction) () -> { // If it is not specified, or it is true, then it should @@ -156,12 +159,15 @@ public final class QuantumToolkit extends Toolkit { return result; }); + @SuppressWarnings("removal") private static boolean debug = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("quantum.debug")); + @SuppressWarnings("removal") private static Integer pulseHZ = AccessController.doPrivileged((PrivilegedAction) () -> Integer.getInteger("javafx.animation.pulse")); + @SuppressWarnings("removal") static final boolean liveResize = AccessController.doPrivileged((PrivilegedAction) () -> { boolean isSWT = "swt".equals(System.getProperty("glass.platform")); @@ -169,12 +175,14 @@ public final class QuantumToolkit extends Toolkit { return "true".equals(System.getProperty("javafx.live.resize", result)); }); + @SuppressWarnings("removal") static final boolean drawInPaint = 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));}); + @SuppressWarnings("removal") private static boolean singleThreaded = AccessController.doPrivileged((PrivilegedAction) () -> { Boolean result = Boolean.getBoolean("quantum.singlethreaded"); @@ -184,6 +192,7 @@ public final class QuantumToolkit extends Toolkit { return result; }); + @SuppressWarnings("removal") private static boolean noRenderJobs = AccessController.doPrivileged((PrivilegedAction) () -> { Boolean result = Boolean.getBoolean("quantum.norenderjobs"); @@ -238,6 +247,7 @@ boolean get() { private final PerformanceTracker perfTracker = new PerformanceTrackerImpl(); + @SuppressWarnings("removal") @Override public boolean init() { /* * Glass Mac, X11 need Application.setDeviceDetails to happen prior to Glass Application.Run @@ -596,7 +606,7 @@ void vsyncHint() { } } - @Override public TKStage createTKStage(Window peerWindow, boolean securityDialog, StageStyle stageStyle, boolean primary, Modality modality, TKStage owner, boolean rtl, AccessControlContext acc) { + @Override public TKStage createTKStage(Window peerWindow, boolean securityDialog, StageStyle stageStyle, boolean primary, Modality modality, TKStage owner, boolean rtl, @SuppressWarnings("removal") AccessControlContext acc) { assertToolkitRunning(); WindowStage stage = new WindowStage(peerWindow, securityDialog, stageStyle, modality, owner); stage.setSecurityContext(acc); @@ -669,7 +679,7 @@ void vsyncHint() { @Override public TKStage createTKPopupStage(Window peerWindow, StageStyle popupStyle, TKStage owner, - AccessControlContext acc) { + @SuppressWarnings("removal") AccessControlContext acc) { assertToolkitRunning(); boolean securityDialog = owner instanceof WindowStage ? ((WindowStage)owner).isSecurityDialog() : false; @@ -680,7 +690,7 @@ void vsyncHint() { return stage; } - @Override public TKStage createTKEmbeddedStage(HostInterface host, AccessControlContext acc) { + @Override public TKStage createTKEmbeddedStage(HostInterface host, @SuppressWarnings("removal") AccessControlContext acc) { assertToolkitRunning(); EmbeddedStage stage = new EmbeddedStage(host); stage.setSecurityContext(acc); @@ -838,6 +848,7 @@ private float getMaxRenderScale() { super.exit(); } + @SuppressWarnings("removal") public void dispose() { if (toolkitRunning.compareAndSet(true, false)) { pulseTimer.stop(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/RotateGestureRecognizer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/RotateGestureRecognizer.java index 65d7bb74abc..b5485cc9dc7 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/RotateGestureRecognizer.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/RotateGestureRecognizer.java @@ -44,6 +44,7 @@ import javafx.beans.property.DoubleProperty; import javafx.beans.property.SimpleDoubleProperty; +@SuppressWarnings("removal") class RotateGestureRecognizer implements GestureRecognizer { private ViewScene scene; diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ScrollGestureRecognizer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ScrollGestureRecognizer.java index 1acc8eebafc..3974749166c 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ScrollGestureRecognizer.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ScrollGestureRecognizer.java @@ -43,6 +43,7 @@ import javafx.beans.property.DoubleProperty; import javafx.beans.property.SimpleDoubleProperty; +@SuppressWarnings("removal") class ScrollGestureRecognizer implements GestureRecognizer { // gesture will be activated if |scroll amount| > SCROLL_THRESHOLD private static double SCROLL_THRESHOLD = 10; //in pixels diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/SwipeGestureRecognizer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/SwipeGestureRecognizer.java index 4b8a535d9ca..c50786d30ac 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/SwipeGestureRecognizer.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/SwipeGestureRecognizer.java @@ -148,6 +148,7 @@ private EventType calcSwipeType(TouchPointTracker tracker) { } } + @SuppressWarnings("removal") private void handleSwipeType(final EventType swipeType, final CenterComputer cc, final int touchCount, final int modifiers, final boolean isDirect) { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java index e25a2ae269a..de873c34d5e 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java @@ -259,7 +259,7 @@ StageStyle getStyle() { return style; } - @Override public TKScene createTKScene(boolean depthBuffer, boolean msaa, AccessControlContext acc) { + @Override public TKScene createTKScene(boolean depthBuffer, boolean msaa, @SuppressWarnings("removal") AccessControlContext acc) { ViewScene scene = new ViewScene(depthBuffer, msaa); scene.setSecurityContext(acc); return scene; @@ -630,6 +630,7 @@ boolean isApplet() { private boolean hasPermission(Permission perm) { try { + @SuppressWarnings("removal") final SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(perm, getAccessControlContext()); @@ -762,6 +763,7 @@ OverlayWarning getWarning() { } } + @SuppressWarnings("removal") void fullscreenChanged(final boolean fs) { if (!fs) { if (activeFSWindow.compareAndSet(this, null)) { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ZoomGestureRecognizer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ZoomGestureRecognizer.java index 3e321411765..aadb0f33835 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ZoomGestureRecognizer.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ZoomGestureRecognizer.java @@ -43,6 +43,7 @@ import javafx.beans.property.DoubleProperty; import javafx.beans.property.SimpleDoubleProperty; +@SuppressWarnings("removal") class ZoomGestureRecognizer implements GestureRecognizer { // gesture will be activated if |zoomFactor - 1| > ZOOM_FACTOR_THRESHOLD private static double ZOOM_FACTOR_THRESHOLD = 0.1; diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/util/ModuleHelper.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/util/ModuleHelper.java index 10dc1abcbba..0d397875942 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/util/ModuleHelper.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/util/ModuleHelper.java @@ -30,6 +30,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; +@SuppressWarnings("removal") public class ModuleHelper { private static final Method getModuleMethod; private static final Method addReadsMethod; diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/util/Utils.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/util/Utils.java index f2cd0ccabf8..2026d1b9029 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/util/Utils.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/util/Utils.java @@ -669,6 +669,7 @@ private static VPos getVPosOpposite(HPos hpos, VPos vpos) { } public static boolean hasFullScreenStage(final Screen screen) { + @SuppressWarnings("removal") final List allWindows = AccessController.doPrivileged( (PrivilegedAction>) () -> Window.getWindows(), null, @@ -974,6 +975,7 @@ public static String convertUnicode(String src) { return new String(dst, 0, dstIndex); } + @SuppressWarnings("removal") public static synchronized void loadNativeSwingLibrary() { AccessController.doPrivileged((PrivilegedAction) () -> { String libName = "prism_common"; diff --git a/modules/javafx.graphics/src/main/java/com/sun/marlin/DMarlinRenderingEngine.java b/modules/javafx.graphics/src/main/java/com/sun/marlin/DMarlinRenderingEngine.java index 76091199aff..8ecaeeba6f6 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/marlin/DMarlinRenderingEngine.java +++ b/modules/javafx.graphics/src/main/java/com/sun/marlin/DMarlinRenderingEngine.java @@ -74,6 +74,7 @@ private DMarlinRenderingEngine() { USE_THREAD_LOCAL = MarlinProperties.isUseThreadLocal(); // Soft reference by default: + @SuppressWarnings("removal") final String refType = AccessController.doPrivileged( (PrivilegedAction) () -> { String value = System.getProperty("prism.marlin.useRef"); diff --git a/modules/javafx.graphics/src/main/java/com/sun/marlin/MarlinProperties.java b/modules/javafx.graphics/src/main/java/com/sun/marlin/MarlinProperties.java index 62d9ddff43e..05965c002d4 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/marlin/MarlinProperties.java +++ b/modules/javafx.graphics/src/main/java/com/sun/marlin/MarlinProperties.java @@ -242,6 +242,7 @@ public static float getQuadDecD2() { } // system property utilities + @SuppressWarnings("removal") static String getString(final String key, final String def) { return AccessController.doPrivileged( (PrivilegedAction) () -> { @@ -250,6 +251,7 @@ static String getString(final String key, final String def) { }); } + @SuppressWarnings("removal") static boolean getBoolean(final String key, final String def) { return Boolean.valueOf(AccessController.doPrivileged( (PrivilegedAction) () -> { @@ -261,6 +263,7 @@ static boolean getBoolean(final String key, final String def) { static int getInteger(final String key, final int def, final int min, final int max) { + @SuppressWarnings("removal") final String property = AccessController.doPrivileged( (PrivilegedAction) () -> System.getProperty(key)); @@ -291,6 +294,7 @@ public static double getDouble(final String key, final double def, final double min, final double max) { double value = def; + @SuppressWarnings("removal") final String property = AccessController.doPrivileged( (PrivilegedAction) () -> System.getProperty(key)); diff --git a/modules/javafx.graphics/src/main/java/com/sun/marlin/OffHeapArray.java b/modules/javafx.graphics/src/main/java/com/sun/marlin/OffHeapArray.java index a1ab03bb768..88396c1a1e0 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/marlin/OffHeapArray.java +++ b/modules/javafx.graphics/src/main/java/com/sun/marlin/OffHeapArray.java @@ -34,6 +34,7 @@ /** * */ +@SuppressWarnings("removal") final class OffHeapArray { // unsafe reference diff --git a/modules/javafx.graphics/src/main/java/com/sun/marlin/RendererStats.java b/modules/javafx.graphics/src/main/java/com/sun/marlin/RendererStats.java index f44692804f2..33cc9631d63 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/marlin/RendererStats.java +++ b/modules/javafx.graphics/src/main/java/com/sun/marlin/RendererStats.java @@ -353,6 +353,7 @@ static void dumpStats() { private final ConcurrentLinkedQueue allStats = new ConcurrentLinkedQueue(); + @SuppressWarnings("removal") private RendererStatsHolder() { AccessController.doPrivileged( (PrivilegedAction) () -> { diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DPipeline.java b/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DPipeline.java index 8d186fb1ebe..f0084afa4e1 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DPipeline.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DPipeline.java @@ -35,6 +35,7 @@ import java.security.PrivilegedAction; import java.util.List; +@SuppressWarnings("removal") public final class D3DPipeline extends GraphicsPipeline { private static final boolean d3dEnabled; diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java b/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java index 197cb2ccae6..42d6a1ded7b 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java @@ -418,6 +418,7 @@ public Shader createStockShader(final String name) { throw new IllegalArgumentException("Shader name must be non-null"); } try { + @SuppressWarnings("removal") InputStream stream = AccessController.doPrivileged( (PrivilegedAction) () -> D3DResourceFactory.class. getResourceAsStream("hlsl/" + name + ".obj") diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2Pipeline.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2Pipeline.java index 4f07e91ae8d..446d3f65dec 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2Pipeline.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2Pipeline.java @@ -36,6 +36,7 @@ import java.security.PrivilegedAction; import java.util.HashMap; +@SuppressWarnings("removal") public class ES2Pipeline extends GraphicsPipeline { public static final GLFactory glFactory; diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLFactory.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLFactory.java index d29fa2846ec..6f5956dd017 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLFactory.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLFactory.java @@ -31,6 +31,7 @@ import java.security.PrivilegedAction; import java.util.HashMap; +@SuppressWarnings("removal") abstract class GLFactory { private static native boolean diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLPixelFormat.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLPixelFormat.java index 5ac66890c17..3ac94b71495 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLPixelFormat.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLPixelFormat.java @@ -29,6 +29,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; +@SuppressWarnings("removal") class GLPixelFormat { final private Attributes attributes; final private long nativeScreen; diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/MonocleGLDrawable.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/MonocleGLDrawable.java index 8ef6baa6e68..65f54cbda9d 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/MonocleGLDrawable.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/MonocleGLDrawable.java @@ -32,6 +32,7 @@ class MonocleGLDrawable extends GLDrawable { + @SuppressWarnings("removal") private static final boolean transparentFramebuffer = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("com.sun.javafx.transparentFramebuffer")); diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/impl/BufferUtil.java b/modules/javafx.graphics/src/main/java/com/sun/prism/impl/BufferUtil.java index 926cb7675de..88721e2cb4f 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/impl/BufferUtil.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/impl/BufferUtil.java @@ -57,6 +57,7 @@ public class BufferUtil { private BufferUtil() { } + @SuppressWarnings("removal") public static void nativeOrder(ByteBuffer buf) { if (!isCDCFP) { try { diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/impl/PrismSettings.java b/modules/javafx.graphics/src/main/java/com/sun/prism/impl/PrismSettings.java index 24772f3993b..552b9efa100 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/impl/PrismSettings.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/impl/PrismSettings.java @@ -112,6 +112,7 @@ private static void printBooleanOption(boolean opt, String trueStr) { } static { + @SuppressWarnings("removal") final Properties systemProperties = (Properties) AccessController.doPrivileged( (PrivilegedAction) () -> System.getProperties()); diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/impl/ps/BaseShaderGraphics.java b/modules/javafx.graphics/src/main/java/com/sun/prism/impl/ps/BaseShaderGraphics.java index 26365eb51b8..fb1d0c0c9f8 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/impl/ps/BaseShaderGraphics.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/impl/ps/BaseShaderGraphics.java @@ -508,6 +508,7 @@ private static float getStrokeExpansionFactor(BasicStroke stroke) { private static final float FRINGE_FACTOR; static { + @SuppressWarnings("removal") String v = (String) AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("prism.primshaderpad")); if (v == null) { FRINGE_FACTOR = -0.5f; diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/J2DFontFactory.java b/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/J2DFontFactory.java index 21a164701a6..99859306d5c 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/J2DFontFactory.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/J2DFontFactory.java @@ -123,6 +123,7 @@ public PGFont[] loadEmbeddedFont(String name, InputStream fontStream, * printing begins, so grabs a copy of the file holding an * embedded font to 2D on first use. */ + @SuppressWarnings("removal") public static void registerFont(final FontResource fr) { AccessController.doPrivileged((PrivilegedAction) () -> { @@ -146,6 +147,7 @@ public static void registerFont(final FontResource fr) { }); } + @SuppressWarnings("removal") public PGFont[] loadEmbeddedFont(String name, String path, float size, boolean register, @@ -189,6 +191,7 @@ public Object run() { * subject to change. * ALso this may be just a stop gap measure. */ + @SuppressWarnings("removal") static java.awt.Font getCompositeFont(final java.awt.Font srcFont) { if (PlatformUtil.isMac()) { return srcFont; diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/print/J2DPrinterJob.java b/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/print/J2DPrinterJob.java index 0ca87a96260..b2b8639f5ad 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/print/J2DPrinterJob.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/print/J2DPrinterJob.java @@ -89,6 +89,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; +@SuppressWarnings("removal") public class J2DPrinterJob implements PrinterJobImpl { static { diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/sw/SWPipeline.java b/modules/javafx.graphics/src/main/java/com/sun/prism/sw/SWPipeline.java index 6822ebea548..baf526696c3 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/sw/SWPipeline.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/sw/SWPipeline.java @@ -35,6 +35,7 @@ import java.util.List; import java.util.HashMap; +@SuppressWarnings("removal") public final class SWPipeline extends GraphicsPipeline { static { diff --git a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/ImageData.java b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/ImageData.java index 1ad56732ded..cf6c0f63728 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/ImageData.java +++ b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/ImageData.java @@ -42,6 +42,7 @@ * it intended to be used with using * {@link #validate(com.sun.scenario.effect.FilterContext)} method. */ +@SuppressWarnings("removal") public class ImageData { private static HashSet alldatas; diff --git a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/BufferUtil.java b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/BufferUtil.java index 1c69d9a243e..b8d41dc3dc4 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/BufferUtil.java +++ b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/BufferUtil.java @@ -57,6 +57,7 @@ public class BufferUtil { private BufferUtil() { } + @SuppressWarnings("removal") public static void nativeOrder(ByteBuffer buf) { if (!isCDCFP) { try { diff --git a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/ImagePool.java b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/ImagePool.java index 2f4ae76ab57..584619d4cac 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/ImagePool.java +++ b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/ImagePool.java @@ -39,6 +39,7 @@ * a fairly expensive operation (in terms of footprint and performance), * especially for the GPU backends, so image reuse is critical. */ +@SuppressWarnings("removal") public class ImagePool { public static long numEffects; diff --git a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/Renderer.java b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/Renderer.java index c6413abe800..fce00a4c3a4 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/Renderer.java +++ b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/Renderer.java @@ -92,6 +92,7 @@ public static enum RendererState { Collections.synchronizedMap(new HashMap(5)); private final ImagePool imagePool; + @SuppressWarnings("removal") protected static final boolean verbose = AccessController.doPrivileged( (PrivilegedAction) () -> Boolean.getBoolean("decora.verbose")); diff --git a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/RendererFactory.java b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/RendererFactory.java index 45abbf74c1c..5c8724dd286 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/RendererFactory.java +++ b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/RendererFactory.java @@ -179,6 +179,7 @@ static Renderer getSoftwareRenderer() { return r; } + @SuppressWarnings("removal") static Renderer createRenderer(final FilterContext fctx) { return AccessController.doPrivileged((PrivilegedAction) () -> { Renderer r = null; diff --git a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/state/LinearConvolveRenderState.java b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/state/LinearConvolveRenderState.java index 0a61831daf4..25e09f9b5f8 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/state/LinearConvolveRenderState.java +++ b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/state/LinearConvolveRenderState.java @@ -71,6 +71,7 @@ public abstract class LinearConvolveRenderState implements RenderState { * The default value is set to 64 if platform is an embedded system and 128 otherwise. */ final int defSize = PlatformUtil.isEmbedded() ? 64 : MAX_COMPILED_KERNEL_SIZE; + @SuppressWarnings("removal") int size = AccessController.doPrivileged( (PrivilegedAction) () -> Integer.getInteger( "decora.maxLinearConvolveKernelSize", defSize)); diff --git a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSERendererDelegate.java b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSERendererDelegate.java index 25c57d44f7c..90888d61c36 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSERendererDelegate.java +++ b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSERendererDelegate.java @@ -32,6 +32,7 @@ import com.sun.scenario.effect.impl.Renderer; import com.sun.scenario.effect.impl.sw.RendererDelegate; +@SuppressWarnings("removal") public class SSERendererDelegate implements RendererDelegate { public static native boolean isSupported(); diff --git a/modules/javafx.graphics/src/main/java/javafx/animation/Animation.java b/modules/javafx.graphics/src/main/java/javafx/animation/Animation.java index 80a61364987..3384d7098ca 100644 --- a/modules/javafx.graphics/src/main/java/javafx/animation/Animation.java +++ b/modules/javafx.graphics/src/main/java/javafx/animation/Animation.java @@ -153,12 +153,14 @@ when that class was removed. They could probably be integrated much cleaner into // Access control context, captured whenever we add this pulse receiver to // the PrimaryTimer (which is called when an animation is played or resumed) + @SuppressWarnings("removal") private AccessControlContext accessCtrlCtx = null; private long now() { return TickCalculation.fromNano(timer.nanos()); } + @SuppressWarnings("removal") private void addPulseReceiver() { // Capture the Access Control Context to be used during the animation pulse accessCtrlCtx = AccessController.getContext(); @@ -190,6 +192,7 @@ void resumeReceiver() { } // package private only for the sake of testing + @SuppressWarnings("removal") final PulseReceiver pulseReceiver = new PulseReceiver() { @Override public void timePulse(long now) { final long elapsedTime = now - startTime; diff --git a/modules/javafx.graphics/src/main/java/javafx/animation/AnimationTimer.java b/modules/javafx.graphics/src/main/java/javafx/animation/AnimationTimer.java index 6db3fbe2d71..1e076bc43c4 100644 --- a/modules/javafx.graphics/src/main/java/javafx/animation/AnimationTimer.java +++ b/modules/javafx.graphics/src/main/java/javafx/animation/AnimationTimer.java @@ -48,6 +48,7 @@ public abstract class AnimationTimer { private class AnimationTimerReceiver implements TimerReceiver { + @SuppressWarnings("removal") @Override public void handle(final long now) { if (accessCtrlCtx == null) { throw new IllegalStateException("Error: AccessControlContext not captured"); @@ -65,6 +66,7 @@ private class AnimationTimerReceiver implements TimerReceiver { private boolean active; // Access control context, captured in start() + @SuppressWarnings("removal") private AccessControlContext accessCtrlCtx = null; /** @@ -97,6 +99,7 @@ public AnimationTimer() { * * The {@code AnimationTimer} can be stopped by calling {@link #stop()}. */ + @SuppressWarnings("removal") public void start() { if (!active) { // Capture the Access Control Context to be used during the animation pulse diff --git a/modules/javafx.graphics/src/main/java/javafx/application/Preloader.java b/modules/javafx.graphics/src/main/java/javafx/application/Preloader.java index 5966544dd27..ba774e80b4f 100644 --- a/modules/javafx.graphics/src/main/java/javafx/application/Preloader.java +++ b/modules/javafx.graphics/src/main/java/javafx/application/Preloader.java @@ -110,6 +110,7 @@ public abstract class Preloader extends Application { private static final String lineSeparator; static { + @SuppressWarnings("removal") String prop = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("line.separator")); lineSeparator = prop != null ? prop : "\n"; } diff --git a/modules/javafx.graphics/src/main/java/javafx/concurrent/Service.java b/modules/javafx.graphics/src/main/java/javafx/concurrent/Service.java index 0eee4641069..11a1f5dd933 100644 --- a/modules/javafx.graphics/src/main/java/javafx/concurrent/Service.java +++ b/modules/javafx.graphics/src/main/java/javafx/concurrent/Service.java @@ -168,6 +168,7 @@ public abstract class Service implements Worker, EventTarget { }; // Addition of doPrivileged added due to RT-19580 + @SuppressWarnings("removal") 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 @@ -179,6 +180,7 @@ public abstract class Service implements Worker, EventTarget { }; // Addition of doPrivileged added due to RT-19580 + @SuppressWarnings("removal") private static final ThreadFactory THREAD_FACTORY = run -> AccessController.doPrivileged((PrivilegedAction) () -> { final Thread th = new Thread(THREAD_GROUP, run); th.setUncaughtExceptionHandler(UNCAUGHT_HANDLER); @@ -717,6 +719,7 @@ void cancelFromReadyState() { * @param task a non-null task to execute * @since JavaFX 2.1 */ + @SuppressWarnings("removal") protected void executeTask(final Task task) { final AccessControlContext acc = AccessController.getContext(); final Executor e = getExecutor() != null ? getExecutor() : EXECUTOR; diff --git a/modules/javafx.graphics/src/main/java/javafx/concurrent/Task.java b/modules/javafx.graphics/src/main/java/javafx/concurrent/Task.java index 76d871e56ac..70f71cfa501 100644 --- a/modules/javafx.graphics/src/main/java/javafx/concurrent/Task.java +++ b/modules/javafx.graphics/src/main/java/javafx/concurrent/Task.java @@ -1008,6 +1008,7 @@ protected void failed() { } @Override public boolean cancel(boolean mayInterruptIfRunning) { // Delegate to the super implementation to actually attempt to cancel this thing // Assert the modifyThread permission + @SuppressWarnings("removal") boolean flag = AccessController.doPrivileged( (PrivilegedAction) () -> super.cancel(mayInterruptIfRunning), null, diff --git a/modules/javafx.graphics/src/main/java/javafx/css/converter/URLConverter.java b/modules/javafx.graphics/src/main/java/javafx/css/converter/URLConverter.java index a8ff92a912f..573268e3c2d 100644 --- a/modules/javafx.graphics/src/main/java/javafx/css/converter/URLConverter.java +++ b/modules/javafx.graphics/src/main/java/javafx/css/converter/URLConverter.java @@ -180,6 +180,7 @@ private URL resolveRuntimeImport(final URI resourceUri) { System.err.println("WARNING: resolveRuntimeImport cannot resolve: " + resourcePath); + @SuppressWarnings("removal") final SecurityManager sm = System.getSecurityManager(); if (sm == null) { // If the SecurityManager is not null, then just look up the resource on the class-path. @@ -193,6 +194,7 @@ private URL resolveRuntimeImport(final URI resourceUri) { // check whether the path is file from our runtime jar try { + @SuppressWarnings("removal") final URL rtJarURL = AccessController.doPrivileged((PrivilegedExceptionAction) () -> { // getProtectionDomain either throws a SecurityException or returns a non-null value final ProtectionDomain protectionDomain = Application.class.getProtectionDomain(); diff --git a/modules/javafx.graphics/src/main/java/javafx/print/Printer.java b/modules/javafx.graphics/src/main/java/javafx/print/Printer.java index 2c8971eba5b..93a9876e178 100644 --- a/modules/javafx.graphics/src/main/java/javafx/print/Printer.java +++ b/modules/javafx.graphics/src/main/java/javafx/print/Printer.java @@ -70,6 +70,7 @@ public final class Printer { * have permission to browse printers. */ public static ObservableSet getAllPrinters() { + @SuppressWarnings("removal") SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkPrintJobAccess(); @@ -80,6 +81,7 @@ public static ObservableSet getAllPrinters() { private static ReadOnlyObjectWrapper defaultPrinter; private static ReadOnlyObjectWrapper defaultPrinterImpl() { + @SuppressWarnings("removal") SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkPrintJobAccess(); diff --git a/modules/javafx.graphics/src/main/java/javafx/print/PrinterJob.java b/modules/javafx.graphics/src/main/java/javafx/print/PrinterJob.java index bd8140bf304..f4ecb3ab6bd 100644 --- a/modules/javafx.graphics/src/main/java/javafx/print/PrinterJob.java +++ b/modules/javafx.graphics/src/main/java/javafx/print/PrinterJob.java @@ -111,6 +111,7 @@ public final class PrinterJob { * to initiate a printer job. */ public static final PrinterJob createPrinterJob() { + @SuppressWarnings("removal") SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkPrintJobAccess(); @@ -134,6 +135,7 @@ public static final PrinterJob createPrinterJob() { * to initiate a printer job. */ public static final PrinterJob createPrinterJob(Printer printer) { + @SuppressWarnings("removal") SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkPrintJobAccess(); diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java index 9ee37dd5786..eeb0041eaef 100644 --- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java +++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java @@ -9966,7 +9966,7 @@ Accessible getAccessible() { if (accessible == null) { accessible = Application.GetApplication().createAccessible(); accessible.setEventHandler(new Accessible.EventHandler() { - @SuppressWarnings("deprecation") + @SuppressWarnings({"removal","deprecation"}) @Override public AccessControlContext getAccessControlContext() { Scene scene = getScene(); if (scene == null) { diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/PropertyHelper.java b/modules/javafx.graphics/src/main/java/javafx/scene/PropertyHelper.java index 0e6ef796784..6c4e73515e5 100644 --- a/modules/javafx.graphics/src/main/java/javafx/scene/PropertyHelper.java +++ b/modules/javafx.graphics/src/main/java/javafx/scene/PropertyHelper.java @@ -33,6 +33,7 @@ class PropertyHelper { // this runs within a doPrivilege block so this function must be package-private. static boolean getBooleanProperty(final String propName) { try { + @SuppressWarnings("removal") boolean answer = AccessController.doPrivileged((java.security.PrivilegedAction) () -> { String propVal = System.getProperty(propName); diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java index 30e81b8b927..69e0188a2a8 100644 --- a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java +++ b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java @@ -179,6 +179,7 @@ public class Scene implements EventTarget { private EnumSet dirtyBits = EnumSet.noneOf(DirtyBits.class); + @SuppressWarnings("removal") final AccessControlContext acc = AccessController.getContext(); private Camera defaultCamera; @@ -1386,6 +1387,7 @@ private WritableImage doSnapshot(WritableImage img) { private static List snapshotRunnableListB; private static List snapshotRunnableList; + @SuppressWarnings("removal") static void addSnapshotRunnable(final Runnable runnable) { Toolkit.getToolkit().checkFxUserThread(); @@ -6235,6 +6237,7 @@ public Object getUserData() { * * **************************************************************************/ + @SuppressWarnings("removal") private static final NodeOrientation defaultNodeOrientation = AccessController.doPrivileged( (PrivilegedAction) () -> Boolean.getBoolean("javafx.scene.nodeOrientation.RTL")) ? NodeOrientation.RIGHT_TO_LEFT : NodeOrientation.INHERIT; @@ -6438,6 +6441,7 @@ Accessible getAccessible() { if (accessible == null) { accessible = Application.GetApplication().createAccessible(); accessible.setEventHandler(new Accessible.EventHandler() { + @SuppressWarnings("removal") @Override public AccessControlContext getAccessControlContext() { return getPeer().getAccessControlContext(); } diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/input/Clipboard.java b/modules/javafx.graphics/src/main/java/javafx/scene/input/Clipboard.java index b9bed3b120e..9733ebbf586 100644 --- a/modules/javafx.graphics/src/main/java/javafx/scene/input/Clipboard.java +++ b/modules/javafx.graphics/src/main/java/javafx/scene/input/Clipboard.java @@ -187,6 +187,7 @@ public boolean contentPut(Clipboard clipboard) { * the system will invoke the provided callback to stream the image data over to the client. */ + @SuppressWarnings("removal") private final AccessControlContext acc = AccessController.getContext(); /** diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/robot/Robot.java b/modules/javafx.graphics/src/main/java/javafx/scene/robot/Robot.java index 496e42bdb54..4521c1802d6 100644 --- a/modules/javafx.graphics/src/main/java/javafx/scene/robot/Robot.java +++ b/modules/javafx.graphics/src/main/java/javafx/scene/robot/Robot.java @@ -70,6 +70,7 @@ public Robot() { Application.checkEventThread(); // Ensure we have proper permission for creating a robot. + @SuppressWarnings("removal") final SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(CREATE_ROBOT_PERMISSION); diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/text/Font.java b/modules/javafx.graphics/src/main/java/javafx/scene/text/Font.java index 15f602f3165..2195b53f01c 100644 --- a/modules/javafx.graphics/src/main/java/javafx/scene/text/Font.java +++ b/modules/javafx.graphics/src/main/java/javafx/scene/text/Font.java @@ -473,6 +473,7 @@ private static Font[] loadFontInternal(String urlStr, double size, // Getting the path from a File fixes this. path = new java.io.File(path).getPath(); try { + @SuppressWarnings("removal") SecurityManager sm = System.getSecurityManager(); if (sm != null) { FilePermission filePermission = diff --git a/modules/javafx.graphics/src/main/java/javafx/stage/PopupWindow.java b/modules/javafx.graphics/src/main/java/javafx/stage/PopupWindow.java index 0e216eba937..de9e8003d44 100644 --- a/modules/javafx.graphics/src/main/java/javafx/stage/PopupWindow.java +++ b/modules/javafx.graphics/src/main/java/javafx/stage/PopupWindow.java @@ -509,6 +509,7 @@ private void doVisibleChanging(boolean visible) { // Setup the peer StageStyle popupStyle; try { + @SuppressWarnings("removal") final SecurityManager securityManager = System.getSecurityManager(); if (securityManager != null) { diff --git a/modules/javafx.graphics/src/main/java/javafx/stage/Stage.java b/modules/javafx.graphics/src/main/java/javafx/stage/Stage.java index f54bf6409a4..66dce31e0ed 100644 --- a/modules/javafx.graphics/src/main/java/javafx/stage/Stage.java +++ b/modules/javafx.graphics/src/main/java/javafx/stage/Stage.java @@ -1141,6 +1141,7 @@ private void doVisibleChanging(boolean value) { StageStyle stageStyle = getStyle(); if (stageStyle == StageStyle.TRANSPARENT) { + @SuppressWarnings("removal") final SecurityManager securityManager = System.getSecurityManager(); if (securityManager != null) { diff --git a/modules/javafx.graphics/src/main/java/javafx/stage/Window.java b/modules/javafx.graphics/src/main/java/javafx/stage/Window.java index d042a371337..4951eacb80d 100644 --- a/modules/javafx.graphics/src/main/java/javafx/stage/Window.java +++ b/modules/javafx.graphics/src/main/java/javafx/stage/Window.java @@ -199,6 +199,7 @@ public ReadOnlyObjectProperty screenProperty(Window window) { return window.screenProperty(); } + @SuppressWarnings("removal") @Override public AccessControlContext getAccessControlContext(Window window) { return window.acc; @@ -214,6 +215,7 @@ public AccessControlContext getAccessControlContext(Window window) { * @since 9 */ public static ObservableList getWindows() { + @SuppressWarnings("removal") final SecurityManager securityManager = System.getSecurityManager(); if (securityManager != null) { securityManager.checkPermission(ACCESS_WINDOW_LIST_PERMISSION); @@ -222,6 +224,7 @@ public static ObservableList getWindows() { return unmodifiableWindows; } + @SuppressWarnings("removal") final AccessControlContext acc = AccessController.getContext(); protected Window() { diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmedia/locator/Locator.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmedia/locator/Locator.java index 001da6a85d9..d344e0c12eb 100644 --- a/modules/javafx.media/src/main/java/com/sun/media/jfxmedia/locator/Locator.java +++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmedia/locator/Locator.java @@ -167,6 +167,7 @@ private LocatorConnection getConnection(URI uri, String requestMethod) } private static long getContentLengthLong(URLConnection connection) { + @SuppressWarnings("removal") Method method = AccessController.doPrivileged((PrivilegedAction) () -> { try { return URLConnection.class.getMethod("getContentLengthLong"); diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/HostUtils.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/HostUtils.java index c1704a7ae5a..19f7a0b1b8b 100644 --- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/HostUtils.java +++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/HostUtils.java @@ -31,6 +31,7 @@ /** * Common functions that involve the host platform */ +@SuppressWarnings("removal") public class HostUtils { private static String osName; private static String osArch; diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java index 222b42bbcda..72d0374ff27 100644 --- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java +++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java @@ -96,6 +96,7 @@ public static NativeMediaManager getDefaultInstance() { /** * Create a NativeMediaManager. */ + @SuppressWarnings("removal") protected NativeMediaManager() { /* * Load native libraries. This must be done early as platforms may need diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/PlatformManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/PlatformManager.java index 2deefb8cc3f..fb58e3be089 100644 --- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/PlatformManager.java +++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/PlatformManager.java @@ -43,6 +43,7 @@ /** * Core media platform management code. */ +@SuppressWarnings("removal") public final class PlatformManager { private static String enabledPlatforms; static { diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/osx/OSXPlatform.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/osx/OSXPlatform.java index 84e5340aebc..327b8eb8207 100644 --- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/osx/OSXPlatform.java +++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/osx/OSXPlatform.java @@ -67,6 +67,7 @@ public final class OSXPlatform extends Platform { "https" }; + @SuppressWarnings("removal") private static final class OSXPlatformInitializer { private static final OSXPlatform globalInstance; static { diff --git a/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/Disposer.java b/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/Disposer.java index c56f3a13377..007cd36ce65 100644 --- a/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/Disposer.java +++ b/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/Disposer.java @@ -43,6 +43,7 @@ * * @see DisposerRecord */ +@SuppressWarnings("removal") public class Disposer implements Runnable { private static final ReferenceQueue queue = new ReferenceQueue(); private static final Hashtable records = new Hashtable(); diff --git a/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/FXDnD.java b/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/FXDnD.java index c5ac4cef91b..bc5aece8909 100644 --- a/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/FXDnD.java +++ b/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/FXDnD.java @@ -41,6 +41,7 @@ * A utility class to connect DnD mechanism of Swing and FX. * It allows Swing content to use the FX machinery for performing DnD. */ +@SuppressWarnings("removal") final public class FXDnD { public static boolean fxAppThreadIsDispatchThread; private FXDnDInteropN fxdndiop; diff --git a/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/SwingFXUtilsImpl.java b/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/SwingFXUtilsImpl.java index 8ec0b7f234e..ed23f1ddbfc 100644 --- a/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/SwingFXUtilsImpl.java +++ b/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/SwingFXUtilsImpl.java @@ -38,6 +38,7 @@ public class SwingFXUtilsImpl { swFXUtilIOP = new SwingFXUtilsImplInteropN(); } + @SuppressWarnings("removal") private static EventQueue getEventQueue() { return AccessController.doPrivileged( (PrivilegedAction) () -> java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue()); diff --git a/modules/javafx.swing/src/main/java/javafx/embed/swing/JFXPanel.java b/modules/javafx.swing/src/main/java/javafx/embed/swing/JFXPanel.java index 21f6ae430ec..4a88e2be1d0 100644 --- a/modules/javafx.swing/src/main/java/javafx/embed/swing/JFXPanel.java +++ b/modules/javafx.swing/src/main/java/javafx/embed/swing/JFXPanel.java @@ -212,6 +212,7 @@ private synchronized static void initFx() { if (fxInitialized) { return; } + @SuppressWarnings("removal") EventQueue eventQueue = AccessController.doPrivileged( (PrivilegedAction) java.awt.Toolkit .getDefaultToolkit()::getSystemEventQueue); @@ -295,6 +296,7 @@ public void setScene(final Scene newScene) { if (Toolkit.getToolkit().isFxUserThread()) { setSceneImpl(newScene); } else { + @SuppressWarnings("removal") EventQueue eventQueue = AccessController.doPrivileged( (PrivilegedAction) java.awt.Toolkit .getDefaultToolkit()::getSystemEventQueue); @@ -872,6 +874,7 @@ private void setFxEnabled(boolean enabled) { * method is invoked, the chain of parent components is set up with * KeyboardAction event listeners. */ + @SuppressWarnings("removal") @Override public void addNotify() { super.addNotify(); @@ -906,6 +909,7 @@ public InputMethodRequests getInputMethodRequests() { * When this method is invoked, any KeyboardActions set up in the the * chain of parent components are removed. */ + @SuppressWarnings("removal") @Override public void removeNotify() { SwingNodeHelper.runOnFxThread(() -> { if ((stage != null) && stage.isShowing()) { diff --git a/modules/javafx.swing/src/main/java/javafx/embed/swing/SwingNode.java b/modules/javafx.swing/src/main/java/javafx/embed/swing/SwingNode.java index 461b1fbae17..a99309cb3bf 100644 --- a/modules/javafx.swing/src/main/java/javafx/embed/swing/SwingNode.java +++ b/modules/javafx.swing/src/main/java/javafx/embed/swing/SwingNode.java @@ -116,6 +116,7 @@ * * @since JavaFX 8.0 */ +@SuppressWarnings("removal") public class SwingNode extends Node { private static boolean isThreadMerged; diff --git a/modules/javafx.swt/src/main/java/javafx/embed/swt/FXCanvas.java b/modules/javafx.swt/src/main/java/javafx/embed/swt/FXCanvas.java index 472c90d7a1d..b029427e884 100644 --- a/modules/javafx.swt/src/main/java/javafx/embed/swt/FXCanvas.java +++ b/modules/javafx.swt/src/main/java/javafx/embed/swt/FXCanvas.java @@ -259,6 +259,7 @@ static Transfer getCustomTransfer(String mime) { } } else if (SWT.getPlatform().equals("win32")) { try { + @SuppressWarnings("removal") String autoScale = AccessController.doPrivileged((PrivilegedAction)() -> System.getProperty("swt.autoScale")); if (autoScale == null || ! "false".equalsIgnoreCase(autoScale)) { Class dpiUtilClass = Class.forName("org.eclipse.swt.internal.DPIUtil"); @@ -309,6 +310,7 @@ public static FXCanvas getFXCanvas(Scene scene) { return null; } + @SuppressWarnings("removal") private static void initFx() { // NOTE: no internal "com.sun.*" packages can be accessed until after // the JavaFX platform is initialized. The list of needed internal diff --git a/modules/javafx.swt/src/main/java/javafx/embed/swt/SWTFXUtils.java b/modules/javafx.swt/src/main/java/javafx/embed/swt/SWTFXUtils.java index 1bcf3c72d5d..43e48866f4c 100644 --- a/modules/javafx.swt/src/main/java/javafx/embed/swt/SWTFXUtils.java +++ b/modules/javafx.swt/src/main/java/javafx/embed/swt/SWTFXUtils.java @@ -191,6 +191,7 @@ private static int MSB_FIRST() throws Exception { return msbFirst; } + @SuppressWarnings("removal") private static int readValue(final String name) throws Exception { final Class clazz = ImageData.class; return AccessController.doPrivileged( @@ -202,6 +203,7 @@ private static int readValue(final String name) throws Exception { } private static Method blitDirect; + @SuppressWarnings("removal") private static void blit(int op, byte[] srcData, int srcDepth, int srcStride, int srcOrder, int srcX, int srcY, int srcWidth, int srcHeight, @@ -245,6 +247,7 @@ private static void blit(int op, } private static Method blitPalette; + @SuppressWarnings("removal") private static void blit(int op, byte[] srcData, int srcDepth, int srcStride, int srcOrder, int srcX, int srcY, int srcWidth, int srcHeight, @@ -288,6 +291,7 @@ private static void blit(int op, } private static Method getByteOrderMethod; + @SuppressWarnings("removal") private static int getByteOrder(ImageData image) throws Exception { final Class clazz = ImageData.class; if (getByteOrderMethod != null) { diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/UIClientImpl.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/UIClientImpl.java index 4c326d8a12f..bea7f4a6a07 100644 --- a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/UIClientImpl.java +++ b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/UIClientImpl.java @@ -112,6 +112,7 @@ private WebEngine getWebEngine() { return accessor.getEngine(); } + @SuppressWarnings("removal") private AccessControlContext getAccessContext() { return accessor.getPage().getAccessControlContext(); } @@ -122,6 +123,7 @@ private AccessControlContext getAccessContext() { if (w != null && w.getCreatePopupHandler() != null) { final PopupFeatures pf = new PopupFeatures(menu, status, toolbar, resizable); + @SuppressWarnings("removal") WebEngine popup = AccessController.doPrivileged( (PrivilegedAction) () -> w.getCreatePopupHandler().call(pf), getAccessContext()); return Accessor.getPageFor(popup); @@ -129,6 +131,7 @@ private AccessControlContext getAccessContext() { return null; } + @SuppressWarnings("removal") private void dispatchWebEvent(final EventHandler handler, final WebEvent ev) { AccessController.doPrivileged((PrivilegedAction) () -> { handler.handle(ev); @@ -195,6 +198,7 @@ private void notifyVisibilityChanged(boolean visible) { } } + @SuppressWarnings("removal") @Override public boolean confirm(final String text) { final WebEngine w = getWebEngine(); if (w != null && w.getConfirmHandler() != null) { @@ -204,6 +208,7 @@ private void notifyVisibilityChanged(boolean visible) { return false; } + @SuppressWarnings("removal") @Override public String prompt(String text, String defaultValue) { final WebEngine w = getWebEngine(); if (w != null && w.getPromptHandler() != null) { diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java index 2793ad709cc..f7f0940fcc9 100644 --- a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java +++ b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java @@ -48,6 +48,7 @@ import com.sun.webkit.graphics.WCPoint; import com.sun.webkit.graphics.WCRectangle; +@SuppressWarnings("removal") public final class WebPageClientImpl implements WebPageClient { private static final boolean backBufferSupported; private static WebConsoleListener consoleListener = null; diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java index 67ae1f86227..bdfed2b461e 100644 --- a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java +++ b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java @@ -81,6 +81,7 @@ public enum Type { private final static PlatformLogger log = PlatformLogger.getLogger(WCGraphicsPrismContext.class.getName()); + @SuppressWarnings("removal") private final static boolean DEBUG_DRAW_CLIP_SHAPE = Boolean.valueOf( AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("com.sun.webkit.debugDrawClipShape", "false"))); diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/Disposer.java b/modules/javafx.web/src/main/java/com/sun/webkit/Disposer.java index 7920cc30e1c..239ab4c87d8 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/Disposer.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/Disposer.java @@ -52,6 +52,7 @@ * * @see DisposerRecord */ +@SuppressWarnings("removal") public final class Disposer implements Runnable { private static final ReferenceQueue queue = new ReferenceQueue(); private static final Disposer disposerInstance = new Disposer(); diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/MethodHelper.java b/modules/javafx.web/src/main/java/com/sun/webkit/MethodHelper.java index 768d4f13279..f895ed8c6f9 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/MethodHelper.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/MethodHelper.java @@ -36,6 +36,7 @@ * Utility class to wrap method invocation. */ public class MethodHelper { + @SuppressWarnings("removal") private static final boolean logAccessErrors = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("sun.reflect.debugModuleAccessChecks")); diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/Timer.java b/modules/javafx.web/src/main/java/com/sun/webkit/Timer.java index a5566abba32..427489bc28d 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/Timer.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/Timer.java @@ -42,6 +42,7 @@ public static enum Mode { SEPARATE_THREAD } + @SuppressWarnings("removal") public synchronized static Mode getMode() { if (mode == null) { mode = Boolean.valueOf(AccessController.doPrivileged( diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/Utilities.java b/modules/javafx.web/src/main/java/com/sun/webkit/Utilities.java index 735efd7e0e1..1a694049516 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/Utilities.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/Utilities.java @@ -100,6 +100,7 @@ private static final Set asSet(String... items) { "sun.misc" ); + @SuppressWarnings("removal") private static Object fwkInvokeWithContext(final Method method, final Object instance, final Object[] args, diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/WebPage.java b/modules/javafx.web/src/main/java/com/sun/webkit/WebPage.java index 36c1c3d20be..4e6b09f2243 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/WebPage.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/WebPage.java @@ -77,6 +77,7 @@ * */ +@SuppressWarnings("removal") public final class WebPage { private final static PlatformLogger log = PlatformLogger.getLogger(WebPage.class.getName()); private final static PlatformLogger paintLog = PlatformLogger.getLogger(WebPage.class.getName() + ".paint"); diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/dom/JSObject.java b/modules/javafx.web/src/main/java/com/sun/webkit/dom/JSObject.java index 97aaa890bdc..0f3974d9e80 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/dom/JSObject.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/dom/JSObject.java @@ -84,6 +84,7 @@ public Object getMember(String name) { private static native Object getMemberImpl(long peer, int peer_type, String name); + @SuppressWarnings("removal") @Override public void setMember(String name, Object value) throws JSException { Invoker.getInvoker().checkEventThread(); @@ -92,7 +93,7 @@ public void setMember(String name, Object value) throws JSException { } private static native void setMemberImpl(long peer, int peer_type, String name, Object value, - AccessControlContext acc); + @SuppressWarnings("removal") AccessControlContext acc); @Override public void removeMember(String name) throws JSException { @@ -110,6 +111,7 @@ public Object getSlot(int index) throws JSException { private static native Object getSlotImpl(long peer, int peer_type, int index); + @SuppressWarnings("removal") @Override public void setSlot(int index, Object value) throws JSException { Invoker.getInvoker().checkEventThread(); @@ -118,8 +120,9 @@ public void setSlot(int index, Object value) throws JSException { } private static native void setSlotImpl(long peer, int peer_type, int index, Object value, - AccessControlContext acc); + @SuppressWarnings("removal") AccessControlContext acc); + @SuppressWarnings("removal") @Override public Object call(String methodName, Object... args) throws JSException { Invoker.getInvoker().checkEventThread(); @@ -128,7 +131,7 @@ public Object call(String methodName, Object... args) throws JSException { } private static native Object callImpl(long peer, int peer_type, String methodName, Object[] args, - AccessControlContext acc); + @SuppressWarnings("removal") AccessControlContext acc); @Override public String toString() { diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java b/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java index 3cb11e75f82..7a740911177 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java @@ -102,6 +102,7 @@ final class HTTP2Loader extends URLLoaderBase { private final CompletableFuture response; // Use singleton instance of HttpClient to get the maximum benefits + @SuppressWarnings("removal") private final static HttpClient HTTP_CLIENT = AccessController.doPrivileged((PrivilegedAction) () -> HttpClient.newBuilder() .version(Version.HTTP_2) // this is the default @@ -114,6 +115,7 @@ final class HTTP2Loader extends URLLoaderBase { private static final int DEFAULT_BUFSIZE = 40 * 1024; private final static ByteBuffer BUFFER; static { + @SuppressWarnings("removal") int bufSize = AccessController.doPrivileged( (PrivilegedAction) () -> Integer.valueOf(System.getProperty("jdk.httpclient.bufsize", Integer.toString(DEFAULT_BUFSIZE)))); @@ -367,6 +369,7 @@ private BodySubscriber getBodySubscriber(final String contentEncoding) { createNormalBodySubscriber() : createZIPEncodedBodySubscriber(contentEncoding); } + @SuppressWarnings("removal") private HTTP2Loader(WebPage webPage, ByteBufferPool byteBufferPool, boolean asynchronous, @@ -584,7 +587,7 @@ private Void didFail(final Throwable th) { throw th; } catch (MalformedURLException ex) { errorCode = LoadListenerClient.MALFORMED_URL; - } catch (AccessControlException ex) { + } catch (@SuppressWarnings("removal") AccessControlException ex) { errorCode = LoadListenerClient.PERMISSION_DENIED; } catch (UnknownHostException ex) { errorCode = LoadListenerClient.UNKNOWN_HOST; diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/network/NetworkContext.java b/modules/javafx.web/src/main/java/com/sun/webkit/network/NetworkContext.java index da12d46dc00..55615dde1ee 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/network/NetworkContext.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/network/NetworkContext.java @@ -42,6 +42,7 @@ import com.sun.webkit.WebPage; import java.security.Permission; +@SuppressWarnings("removal") final class NetworkContext { private static final PlatformLogger logger = diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/network/PublicSuffixes.java b/modules/javafx.web/src/main/java/com/sun/webkit/network/PublicSuffixes.java index 4372ea082be..c02f7ce722d 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/network/PublicSuffixes.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/network/PublicSuffixes.java @@ -72,6 +72,7 @@ private enum Rule { /** * The public suffix list file. */ + @SuppressWarnings("removal") private static final File pslFile = AccessController.doPrivileged((PrivilegedAction) () -> new File(System.getProperty("java.home"), "lib/security/public_suffix_list.dat")); @@ -79,6 +80,7 @@ private enum Rule { /* * Determines whether the public suffix list file is available. */ + @SuppressWarnings("removal") private static final boolean pslFileExists = AccessController.doPrivileged( (PrivilegedAction) () -> { if (!pslFile.exists()) { @@ -195,6 +197,7 @@ private static Rules createRules(String tld) { } private static InputStream getPubSuffixStream() { + @SuppressWarnings("removal") InputStream is = AccessController.doPrivileged( (PrivilegedAction) () -> { try { diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/network/SocketStreamHandle.java b/modules/javafx.web/src/main/java/com/sun/webkit/network/SocketStreamHandle.java index 30ed0420386..54ded43709a 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/network/SocketStreamHandle.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/network/SocketStreamHandle.java @@ -101,6 +101,7 @@ private static SocketStreamHandle fwkCreate(String host, int port, return ssh; } + @SuppressWarnings("removal") private void run() { if (webPage == null) { logger.finest("{0} is not associated with any web " @@ -197,6 +198,7 @@ private void doRun() { } private void connect() throws IOException { + @SuppressWarnings("removal") SecurityManager securityManager = System.getSecurityManager(); if (securityManager != null) { securityManager.checkConnect(host, port); @@ -207,6 +209,7 @@ private void connect() throws IOException { boolean success = false; IOException lastException = null; boolean triedDirectConnection = false; + @SuppressWarnings("removal") ProxySelector proxySelector = AccessController.doPrivileged( (PrivilegedAction) () -> ProxySelector.getDefault()); if (proxySelector != null) { @@ -419,6 +422,7 @@ private static final class CustomThreadFactory implements ThreadFactory { private final AtomicInteger index = new AtomicInteger(1); private CustomThreadFactory() { + @SuppressWarnings("removal") SecurityManager sm = System.getSecurityManager(); group = (sm != null) ? sm.getThreadGroup() : Thread.currentThread().getThreadGroup(); diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/network/URLLoader.java b/modules/javafx.web/src/main/java/com/sun/webkit/network/URLLoader.java index 88854f08f0a..33ab90cce59 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/network/URLLoader.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/network/URLLoader.java @@ -122,6 +122,7 @@ public void fwkCancel() { /** * {@inheritDoc} */ + @SuppressWarnings("removal") @Override public void run() { // Run the loader in the page's access control context @@ -185,7 +186,7 @@ private void doRun() { } catch (MalformedURLException ex) { error = ex; errorCode = LoadListenerClient.MALFORMED_URL; - } catch (AccessControlException ex) { + } catch (@SuppressWarnings("removal") AccessControlException ex) { error = ex; errorCode = LoadListenerClient.PERMISSION_DENIED; } catch (UnknownHostException ex) { diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/network/URLs.java b/modules/javafx.web/src/main/java/com/sun/webkit/network/URLs.java index b3d220d08e2..b82ca85daa2 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/network/URLs.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/network/URLs.java @@ -80,6 +80,7 @@ public static URL newURL(String spec) throws MalformedURLException { * @throws MalformedURLException if no protocol is specified, or an * unknown protocol is found. */ + @SuppressWarnings("removal") public static URL newURL(final URL context, final String spec) throws MalformedURLException { diff --git a/modules/javafx.web/src/main/java/javafx/scene/web/HTMLEditorSkin.java b/modules/javafx.web/src/main/java/javafx/scene/web/HTMLEditorSkin.java index a8e4799e48b..a33da411fda 100644 --- a/modules/javafx.web/src/main/java/javafx/scene/web/HTMLEditorSkin.java +++ b/modules/javafx.web/src/main/java/javafx/scene/web/HTMLEditorSkin.java @@ -830,6 +830,7 @@ private Button addButton(ToolBar toolbar, final String iconName, String tooltipT button.getStyleClass().add(styleClass); toolbar.getItems().add(button); + @SuppressWarnings("removal") 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)); @@ -854,6 +855,7 @@ private ToggleButton addToggleButton(ToolBar toolbar, ToggleGroup toggleGroup, toggleButton.setToggleGroup(toggleGroup); } + @SuppressWarnings("removal") 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)); diff --git a/modules/javafx.web/src/main/java/javafx/scene/web/WebEngine.java b/modules/javafx.web/src/main/java/javafx/scene/web/WebEngine.java index 0edd69e480a..896988804a2 100644 --- a/modules/javafx.web/src/main/java/javafx/scene/web/WebEngine.java +++ b/modules/javafx.web/src/main/java/javafx/scene/web/WebEngine.java @@ -1565,6 +1565,7 @@ private InspectorClientImpl(WebEngine engine) { } + @SuppressWarnings("removal") @Override public boolean sendMessageToFrontend(final String message) { boolean result = false; From 9698e8785abe162fe39fcc9b615c2fb7ad9b9b99 Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Wed, 2 Jun 2021 08:53:02 -0700 Subject: [PATCH 2/5] Suppress removal warnings for Security Manager methods in tests --- .../test/java/test/com/sun/javafx/pgstub/StubScene.java | 1 + .../test/java/test/com/sun/javafx/pgstub/StubStage.java | 2 +- .../test/java/test/com/sun/javafx/pgstub/StubToolkit.java | 8 ++++---- .../java/test/javafx/scene/input/DragAndDropTest.java | 2 +- .../java/test/javafx/scene/web/UserDataDirectoryTest.java | 4 ++++ .../sun/javafx/css/StylesheetWithSecurityManagerTest.java | 3 +++ .../test/robot/helloworld/CustomSecurityManagerTest.java | 5 +++++ 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubScene.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubScene.java index 9c790c18f7b..2d589335fb7 100644 --- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubScene.java +++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubScene.java @@ -135,6 +135,7 @@ public NGCamera getCamera() { return camera; } + @SuppressWarnings("removal") @Override public AccessControlContext getAccessControlContext() { return null; diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java index 2b762bc3473..472daa80627 100644 --- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java +++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java @@ -48,7 +48,7 @@ public void setTKStageListener(TKStageListener listener) { } @Override - public TKScene createTKScene(boolean depthBuffer, boolean msaa, AccessControlContext acc) { + public TKScene createTKScene(boolean depthBuffer, boolean msaa, @SuppressWarnings("removal") AccessControlContext acc) { return new StubScene(); } diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java index 9c9585d97cc..ee40fc3c2f1 100644 --- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java +++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java @@ -120,18 +120,18 @@ public boolean init() { } @Override - public TKStage createTKStage(Window peerWindow, boolean securityDialog, StageStyle stageStyle, boolean primary, Modality modality, TKStage owner, boolean rtl, AccessControlContext acc) { + public TKStage createTKStage(Window peerWindow, boolean securityDialog, StageStyle stageStyle, boolean primary, Modality modality, TKStage owner, boolean rtl, @SuppressWarnings("removal") AccessControlContext acc) { return new StubStage(); } @Override - public TKStage createTKPopupStage(Window peerWindow, StageStyle popupStyle, TKStage owner, AccessControlContext acc) { + public TKStage createTKPopupStage(Window peerWindow, StageStyle popupStyle, TKStage owner, @SuppressWarnings("removal") AccessControlContext acc) { return new StubPopupStage(); } @Override - public TKStage createTKEmbeddedStage(HostInterface host, AccessControlContext acc) { + public TKStage createTKEmbeddedStage(HostInterface host, @SuppressWarnings("removal") AccessControlContext acc) { return new StubStage(); } @@ -388,7 +388,7 @@ public void clearPulseRequested() { private double offsetY; @Override - public void setSecurityContext(AccessControlContext ctx) { + public void setSecurityContext(@SuppressWarnings("removal") AccessControlContext ctx) { } @Override public Set getContentTypes() { diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/DragAndDropTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/DragAndDropTest.java index dcf6c598845..20e86dac49e 100644 --- a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/DragAndDropTest.java +++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/DragAndDropTest.java @@ -1624,7 +1624,7 @@ private class ClipboardImpl implements TKClipboard { private double offsetY; @Override - public void setSecurityContext(AccessControlContext ctx) { + public void setSecurityContext(@SuppressWarnings("removal") AccessControlContext ctx) { } @Override diff --git a/modules/javafx.web/src/test/java/test/javafx/scene/web/UserDataDirectoryTest.java b/modules/javafx.web/src/test/java/test/javafx/scene/web/UserDataDirectoryTest.java index a8e874db7c7..663da7e2a8f 100644 --- a/modules/javafx.web/src/test/java/test/javafx/scene/web/UserDataDirectoryTest.java +++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/UserDataDirectoryTest.java @@ -400,6 +400,7 @@ public void testIOErrorWithRecoveringHandler() throws IOException { } } + @SuppressWarnings("removal") @Test public void testSecurityError() { String url = new File("src/test/resources/test/html/ipsum.html") @@ -417,6 +418,7 @@ public void testSecurityError() { assertHasNoLocalStorage(webEngine); } + @SuppressWarnings("removal") @Test public void testSecurityErrorWithPassiveHandler() { String url = new File("src/test/resources/test/html/ipsum.html") @@ -438,6 +440,7 @@ public void testSecurityErrorWithPassiveHandler() { assertOccurred(USER_DATA_DIRECTORY_SECURITY_ERROR, handler); } + @SuppressWarnings("removal") @Test public void testSecurityErrorWithRecoveringHandler() { String url = new File("src/test/resources/test/html/ipsum.html") @@ -718,6 +721,7 @@ private static final class ErrorHandler } } + @SuppressWarnings("removal") private static final class CustomSecurityManager extends SecurityManager { private final String path; diff --git a/tests/system/src/test/java/test/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java b/tests/system/src/test/java/test/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java index 1b62b88becb..50378736c97 100644 --- a/tests/system/src/test/java/test/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java @@ -86,6 +86,7 @@ public ObservableSet getPseudoClassStates() { } }; + @SuppressWarnings("removal") @Test public void testRT_38395() throws Exception { @@ -112,6 +113,7 @@ public void testRT_38395() throws Exception { assertEquals(expected.getBlue(), base.getBlue(), 1E-6); } + @SuppressWarnings("removal") @Test public void testRT_38395_import_local() throws Exception { System.setSecurityManager(new TestSecurityManager()); @@ -140,6 +142,7 @@ public void testRT_38395_import_local() throws Exception { // // The code in URLConverter that this attempts to test only checks to see whether or not there is a SecurityManager. // + @SuppressWarnings("removal") static class TestSecurityManager extends SecurityManager { @Override public void checkPermission(Permission perm) { diff --git a/tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java b/tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java index 34e041b0e03..6f50577e02c 100644 --- a/tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java +++ b/tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java @@ -62,6 +62,7 @@ public class CustomSecurityManagerTest extends VisualTestBase { private static final int WIDTH = 400; private static final int HEIGHT = 300; + @SuppressWarnings("removal") static class MySecurityManager extends SecurityManager { private final boolean permissive; @@ -91,11 +92,13 @@ static class MySecurityManager extends SecurityManager { } } + @SuppressWarnings("removal") @After public void cleanup() { System.setSecurityManager(null); } + @SuppressWarnings("removal") private void doTestOnTopCommon(SecurityManager sm, boolean expectedOnTop) { // Skip on Linux due to 8145152 assumeTrue(!PlatformUtil.isLinux()); @@ -139,6 +142,7 @@ private void doTestOnTopCommon(SecurityManager sm, boolean expectedOnTop) { }); } + @SuppressWarnings("removal") private void doTestFullScreenCommon(SecurityManager sm, boolean initFullScreen, boolean expectedFullScreen) @@ -205,6 +209,7 @@ private void doTestFullScreenCommon(SecurityManager sm, }); } + @SuppressWarnings("removal") private void doTestRobotCommon(SecurityManager sm, boolean expectedCreateRobot) { final AtomicReference robot = new AtomicReference<>(); System.setSecurityManager(sm); From 1c42cf8e4ee40adf04cc1539aae9810941db4b35 Mon Sep 17 00:00:00 2001 From: Kevin Rushforth Date: Wed, 2 Jun 2021 08:42:55 -0700 Subject: [PATCH 3/5] Remove unused security manager imports --- .../main/java/com/sun/javafx/property/PropertyReference.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/javafx.base/src/main/java/com/sun/javafx/property/PropertyReference.java b/modules/javafx.base/src/main/java/com/sun/javafx/property/PropertyReference.java index aad77aaed23..11dac8ef592 100644 --- a/modules/javafx.base/src/main/java/com/sun/javafx/property/PropertyReference.java +++ b/modules/javafx.base/src/main/java/com/sun/javafx/property/PropertyReference.java @@ -25,11 +25,8 @@ package com.sun.javafx.property; -import static java.security.AccessController.doPrivileged; - import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.security.PrivilegedAction; import javafx.beans.property.ReadOnlyProperty; From 4f87d1873429f11f35c988cddafdf6d834366104 Mon Sep 17 00:00:00 2001 From: Kevin Rushforth Date: Thu, 3 Jun 2021 13:16:58 -0700 Subject: [PATCH 4/5] Narrow the scope of @SuppressWarnings("removal") annotation --- .../java/com/sun/javafx/PlatformUtil.java | 31 ++++++++++++++----- .../sun/javafx/property/adapter/Disposer.java | 4 +-- .../javafx/scene/control/skin/FXVKSkin.java | 4 +-- .../control/skin/TextInputControlSkin.java | 4 +-- .../com/sun/javafx/fxml/ModuleHelper.java | 5 +-- .../src/main/java/javafx/fxml/FXMLLoader.java | 21 +++++++++++-- .../main/java/com/sun/glass/ui/Screen.java | 5 +-- .../com/sun/glass/ui/gtk/GtkApplication.java | 20 +++++++++--- .../com/sun/glass/ui/ios/IosApplication.java | 4 +-- .../com/sun/glass/ui/mac/MacApplication.java | 10 ++++-- .../com/sun/glass/ui/monocle/EPDScreen.java | 5 +-- .../com/sun/glass/ui/monocle/FBDevScreen.java | 5 +-- .../com/sun/glass/ui/monocle/KeyInput.java | 4 +-- .../com/sun/glass/ui/monocle/LinuxArch.java | 5 +-- .../glass/ui/monocle/LinuxTouchTransform.java | 4 +-- .../com/sun/glass/ui/win/WinApplication.java | 9 ++++-- .../com/sun/glass/utils/NativeLibLoader.java | 6 ++-- .../sun/javafx/application/LauncherImpl.java | 6 ++-- .../sun/javafx/application/PlatformImpl.java | 24 ++++++++------ .../sun/javafx/font/AndroidFontFinder.java | 4 +-- .../com/sun/javafx/font/DFontDecoder.java | 4 +-- .../java/com/sun/javafx/font/Disposer.java | 4 +-- .../sun/javafx/font/FontConfigManager.java | 11 ++++--- .../com/sun/javafx/font/MacFontFinder.java | 4 +-- .../com/sun/javafx/font/PrismFontFactory.java | 14 ++++++--- .../java/com/sun/javafx/font/coretext/OS.java | 4 +-- .../com/sun/javafx/font/directwrite/OS.java | 4 +-- .../sun/javafx/font/freetype/OSFreetype.java | 4 +-- .../com/sun/javafx/font/freetype/OSPango.java | 4 +-- .../sun/javafx/iio/ios/IosImageLoader.java | 4 +-- .../sun/javafx/iio/jpeg/JPEGImageLoader.java | 4 +-- .../main/java/com/sun/javafx/tk/Toolkit.java | 4 +-- .../tk/quantum/GlassViewEventHandler.java | 17 ++++++++-- .../javafx/tk/quantum/PerformanceLogger.java | 6 ++-- .../sun/javafx/tk/quantum/QuantumToolkit.java | 4 +-- .../tk/quantum/RotateGestureRecognizer.java | 7 +++-- .../tk/quantum/ScrollGestureRecognizer.java | 7 +++-- .../tk/quantum/ZoomGestureRecognizer.java | 7 +++-- .../com/sun/javafx/util/ModuleHelper.java | 5 +-- .../java/com/sun/marlin/OffHeapArray.java | 5 +-- .../java/com/sun/prism/d3d/D3DPipeline.java | 5 +-- .../java/com/sun/prism/es2/ES2Pipeline.java | 4 +-- .../java/com/sun/prism/es2/GLFactory.java | 5 +-- .../java/com/sun/prism/es2/GLPixelFormat.java | 4 +-- .../com/sun/prism/j2d/J2DFontFactory.java | 8 ++--- .../sun/prism/j2d/print/J2DPrinterJob.java | 6 ++-- .../java/com/sun/prism/sw/SWPipeline.java | 4 +-- .../com/sun/scenario/effect/ImageData.java | 4 +-- .../sun/scenario/effect/impl/ImagePool.java | 4 +-- .../impl/sw/sse/SSERendererDelegate.java | 4 +-- .../src/main/java/javafx/scene/Node.java | 2 +- .../com/sun/media/jfxmediaimpl/HostUtils.java | 5 +-- .../platform/PlatformManager.java | 4 +-- .../platform/osx/OSXPlatform.java | 5 +-- .../com/sun/javafx/embed/swing/Disposer.java | 4 +-- .../com/sun/javafx/embed/swing/FXDnD.java | 4 +-- .../java/javafx/embed/swing/SwingNode.java | 14 ++++++--- .../sun/javafx/webkit/WebPageClientImpl.java | 5 +-- .../main/java/com/sun/webkit/Disposer.java | 4 +-- .../src/main/java/com/sun/webkit/WebPage.java | 10 ++++-- .../com/sun/webkit/network/HTTP2Loader.java | 5 +-- .../sun/webkit/network/NetworkContext.java | 8 +++-- .../java/com/sun/webkit/network/URLs.java | 5 +-- 63 files changed, 273 insertions(+), 153 deletions(-) diff --git a/modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java b/modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java index c8d2a0dfa24..dc963b19228 100644 --- a/modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java +++ b/modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java @@ -35,7 +35,6 @@ import java.net.URL; import java.util.Properties; -@SuppressWarnings("removal") public class PlatformUtil { // NOTE: since this class can be initialized by application code in some @@ -53,13 +52,28 @@ public class PlatformUtil { private static String javafxPlatform; static { - javafxPlatform = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("javafx.platform")); + @SuppressWarnings("removal") + String str1 = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("javafx.platform")); + javafxPlatform = str1; + loadProperties(); - embedded = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("com.sun.javafx.isEmbedded")); - embeddedType = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("embedded")); - useEGL = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("use.egl")); + + @SuppressWarnings("removal") + boolean bool1 = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("com.sun.javafx.isEmbedded")); + embedded = bool1; + + @SuppressWarnings("removal") + String str2 = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("embedded")); + embeddedType = str2; + + @SuppressWarnings("removal") + boolean bool2 = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("use.egl")); + useEGL = bool2; + if (useEGL) { - doEGLCompositing = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("doNativeComposite")); + @SuppressWarnings("removal") + boolean bool3 = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("doNativeComposite")); + doEGLCompositing = bool3; } else doEGLCompositing = false; } @@ -135,8 +149,8 @@ public static boolean useEGLWindowComposition() { } public static boolean useGLES2() { - String useGles2 = "false"; - useGles2 = + @SuppressWarnings("removal") + String useGles2 = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("use.gles2")); if ("true".equals(useGles2)) return true; @@ -245,6 +259,7 @@ private static File getRTDir() { } } + @SuppressWarnings("removal") private static void loadProperties() { final String vmname = System.getProperty("java.vm.name"); final String arch = System.getProperty("os.arch"); diff --git a/modules/javafx.base/src/main/java/com/sun/javafx/property/adapter/Disposer.java b/modules/javafx.base/src/main/java/com/sun/javafx/property/adapter/Disposer.java index 4699b89b593..c21917c3dd1 100644 --- a/modules/javafx.base/src/main/java/com/sun/javafx/property/adapter/Disposer.java +++ b/modules/javafx.base/src/main/java/com/sun/javafx/property/adapter/Disposer.java @@ -42,7 +42,6 @@ * When the object becomes phantom-reachable, the run() method * of the associated Runnable object will be called. */ -@SuppressWarnings("removal") public class Disposer implements Runnable { private static final ReferenceQueue queue = new ReferenceQueue(); private static final Map records = new ConcurrentHashMap<>(); @@ -51,7 +50,8 @@ public class Disposer implements Runnable { static { disposerInstance = new Disposer(); - java.security.AccessController.doPrivileged( + @SuppressWarnings("removal") + var dummy = java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { public Object run() { /* The thread must be a member of a thread group diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java index 9e8b735d4b1..4b0fb391bf8 100644 --- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java +++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java @@ -76,7 +76,6 @@ import java.security.PrivilegedAction; -@SuppressWarnings("removal") public class FXVKSkin extends SkinBase { private static final int GAP = 6; @@ -191,7 +190,8 @@ private void updateKeys() { static boolean vkLookup = false; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { String s = System.getProperty("com.sun.javafx.vk.adjustwindow"); if (s != null) { vkAdjustWindow = Boolean.valueOf(s); diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TextInputControlSkin.java b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TextInputControlSkin.java index 78a500941a4..48f8292b4b2 100644 --- a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TextInputControlSkin.java +++ b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TextInputControlSkin.java @@ -93,7 +93,6 @@ * @see TextFieldSkin * @see TextAreaSkin */ -@SuppressWarnings("removal") public abstract class TextInputControlSkin extends SkinBase { /************************************************************************** @@ -118,7 +117,8 @@ public static enum Direction { LEFT, RIGHT, UP, DOWN, BEGINNING, END }; static boolean preload = false; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { String s = System.getProperty("com.sun.javafx.virtualKeyboard.preload"); if (s != null) { if (s.equalsIgnoreCase("PRERENDER")) { diff --git a/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/ModuleHelper.java b/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/ModuleHelper.java index 546c96c935b..79813997e9a 100644 --- a/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/ModuleHelper.java +++ b/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/ModuleHelper.java @@ -31,7 +31,6 @@ import java.security.AccessController; import java.security.PrivilegedAction; -@SuppressWarnings("removal") public class ModuleHelper { private static final Method getModuleMethod; private static final Method getResourceAsStreamMethod; @@ -39,8 +38,10 @@ public class ModuleHelper { private static final boolean verbose; static { - verbose = AccessController.doPrivileged((PrivilegedAction) () -> + @SuppressWarnings("removal") + boolean tmp = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.verbose")); + verbose = tmp; if (verbose) { System.err.println("" + ModuleHelper.class.getName() + " : "); diff --git a/modules/javafx.fxml/src/main/java/javafx/fxml/FXMLLoader.java b/modules/javafx.fxml/src/main/java/javafx/fxml/FXMLLoader.java index b72ced341b9..b351a666204 100644 --- a/modules/javafx.fxml/src/main/java/javafx/fxml/FXMLLoader.java +++ b/modules/javafx.fxml/src/main/java/javafx/fxml/FXMLLoader.java @@ -104,7 +104,6 @@ * * @since JavaFX 2.0 */ -@SuppressWarnings("removal") public class FXMLLoader { // Indicates permission to get the ClassLoader @@ -112,6 +111,7 @@ public class FXMLLoader { new RuntimePermission("getClassLoader"); // Instance of StackWalker used to get caller class (must be private) + @SuppressWarnings("removal") private static final StackWalker walker = AccessController.doPrivileged((PrivilegedAction) () -> StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE)); @@ -2123,12 +2123,14 @@ public void invoke(Object... params) { public static final String FX_NAMESPACE_VERSION = "1"; static { - JAVAFX_VERSION = AccessController.doPrivileged(new PrivilegedAction() { + @SuppressWarnings("removal") + String tmp = AccessController.doPrivileged(new PrivilegedAction() { @Override public String run() { return System.getProperty("javafx.version"); } }); + JAVAFX_VERSION = tmp; FXMLLoaderHelper.setFXMLLoaderAccessor(new FXMLLoaderHelper.FXMLLoaderAccessor() { @Override @@ -2429,6 +2431,7 @@ public void setCharset(Charset charset) { */ public ClassLoader getClassLoader() { if (classLoader == null) { + @SuppressWarnings("removal") final SecurityManager sm = System.getSecurityManager(); final Class caller = (sm != null) ? walker.getCallerClass() : @@ -2508,6 +2511,7 @@ public final void setLoadListener(LoadListener loadListener) { * * @since JavaFX 2.1 */ + @SuppressWarnings("removal") public T load() throws IOException { return loadImpl((System.getSecurityManager() != null) ? walker.getCallerClass() @@ -2523,6 +2527,7 @@ public T load() throws IOException { * @throws IOException if an error occurs during loading * @return the loaded object hierarchy */ + @SuppressWarnings("removal") public T load(InputStream inputStream) throws IOException { return loadImpl(inputStream, (System.getSecurityManager() != null) ? walker.getCallerClass() @@ -3131,6 +3136,7 @@ private static boolean needsClassLoaderPermissionCheck(Class caller) { private static ClassLoader getDefaultClassLoader(Class caller) { if (defaultClassLoader == null) { + @SuppressWarnings("removal") final SecurityManager sm = System.getSecurityManager(); if (sm != null) { if (needsClassLoaderPermissionCheck(caller)) { @@ -3148,6 +3154,7 @@ private static ClassLoader getDefaultClassLoader(Class caller) { * @since JavaFX 2.1 */ public static ClassLoader getDefaultClassLoader() { + @SuppressWarnings("removal") final SecurityManager sm = System.getSecurityManager(); final Class caller = (sm != null) ? walker.getCallerClass() : @@ -3166,6 +3173,7 @@ public static void setDefaultClassLoader(ClassLoader defaultClassLoader) { if (defaultClassLoader == null) { throw new NullPointerException(); } + @SuppressWarnings("removal") final SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(MODIFY_FXML_CLASS_LOADER_PERMISSION); @@ -3183,6 +3191,7 @@ public static void setDefaultClassLoader(ClassLoader defaultClassLoader) { * @throws IOException if an error occurs during loading * @return the loaded object hierarchy */ + @SuppressWarnings("removal") public static T load(URL location) throws IOException { return loadImpl(location, (System.getSecurityManager() != null) ? walker.getCallerClass() @@ -3204,6 +3213,7 @@ private static T loadImpl(URL location, Class callerClass) * @throws IOException if an error occurs during loading * @return the loaded object hierarchy */ + @SuppressWarnings("removal") public static T load(URL location, ResourceBundle resources) throws IOException { return loadImpl(location, resources, @@ -3229,6 +3239,7 @@ private static T loadImpl(URL location, ResourceBundle resources, * @throws IOException if an error occurs during loading * @return the loaded object hierarchy */ + @SuppressWarnings("removal") public static T load(URL location, ResourceBundle resources, BuilderFactory builderFactory) throws IOException { @@ -3258,6 +3269,7 @@ private static T loadImpl(URL location, ResourceBundle resources, * * @since JavaFX 2.1 */ + @SuppressWarnings("removal") public static T load(URL location, ResourceBundle resources, BuilderFactory builderFactory, Callback, Object> controllerFactory) @@ -3291,6 +3303,7 @@ private static T loadImpl(URL location, ResourceBundle resources, * * @since JavaFX 2.1 */ + @SuppressWarnings("removal") public static T load(URL location, ResourceBundle resources, BuilderFactory builderFactory, Callback, Object> controllerFactory, @@ -3397,6 +3410,7 @@ static int compareJFXVersions(String rtVer, String nsVer) { } private static void checkClassLoaderPermission() { + @SuppressWarnings("removal") final SecurityManager securityManager = System.getSecurityManager(); if (securityManager != null) { securityManager.checkPermission(MODIFY_FXML_CLASS_LOADER_PERMISSION); @@ -3517,7 +3531,8 @@ private void addAccessibleMembers(final Class type, membersType); final int finalAllowedMemberAccess = allowedMemberAccess; - AccessController.doPrivileged( + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged( new PrivilegedAction() { @Override public Void run() { diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java index 6e17c5d61e1..8fdb95a3944 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java @@ -30,7 +30,6 @@ import java.util.Collections; import java.util.List; -@SuppressWarnings("removal") public final class Screen { // the list of attached screens provided by native. @@ -41,7 +40,9 @@ public final class Screen { private static final int dpiOverride; static { - dpiOverride = AccessController.doPrivileged((PrivilegedAction) () -> Integer.getInteger("com.sun.javafx.screenDPI", 0)).intValue(); + @SuppressWarnings("removal") + int tmp = AccessController.doPrivileged((PrivilegedAction) () -> Integer.getInteger("com.sun.javafx.screenDPI", 0)).intValue(); + dpiOverride = tmp; } public static class EventHandler { diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java index 07d7c3a937c..9e119e42de5 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java @@ -51,7 +51,6 @@ import java.util.concurrent.CountDownLatch; import java.lang.annotation.Native; -@SuppressWarnings("removal") final class GtkApplication extends Application implements InvokeLaterDispatcher.InvokeLaterSubmitter { private static final String SWT_INTERNAL_CLASS = @@ -61,6 +60,7 @@ final class GtkApplication extends Application implements static { //check for SWT-GTK lib presence + @SuppressWarnings("removal") Class OS = AccessController. doPrivileged((PrivilegedAction>) () -> { try { @@ -76,6 +76,7 @@ final class GtkApplication extends Application implements if (OS != null) { PlatformLogger logger = Logging.getJavaFXLogger(); logger.fine("SWT-GTK library found. Try to obtain GTK version."); + @SuppressWarnings("removal") Method method = AccessController. doPrivileged((PrivilegedAction) () -> { try { @@ -106,7 +107,8 @@ final class GtkApplication extends Application implements forcedGtkVersion = 0; } - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { Application.loadNativeLibrary(); return null; }); @@ -145,6 +147,7 @@ private static float getFloat(String propname, float defval, String description) GtkApplication() { + @SuppressWarnings("removal") final int gtkVersion = forcedGtkVersion == 0 ? AccessController.doPrivileged((PrivilegedAction) () -> { String v = System.getProperty("jdk.gtk.version","3"); @@ -156,20 +159,24 @@ private static float getFloat(String propname, float defval, String description) } return ret; }) : forcedGtkVersion; + @SuppressWarnings("removal") boolean gtkVersionVerbose = AccessController.doPrivileged((PrivilegedAction) () -> { return Boolean.getBoolean("jdk.gtk.verbose"); }); if (PrismSettings.allowHiDPIScaling) { - overrideUIScale = AccessController.doPrivileged((PrivilegedAction) () -> + @SuppressWarnings("removal") + float tmp = AccessController.doPrivileged((PrivilegedAction) () -> getFloat("glass.gtk.uiScale", -1.0f, "Forcing UI scaling factor: ")); + overrideUIScale = tmp; } else { overrideUIScale = -1.0f; } int libraryToLoad = _queryLibrary(gtkVersion, gtkVersionVerbose); - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { if (libraryToLoad == QUERY_NO_DISPLAY) { throw new UnsupportedOperationException("Unable to open DISPLAY"); } else if (libraryToLoad == QUERY_USE_CURRENT) { @@ -199,6 +206,7 @@ private static float getFloat(String propname, float defval, String description) } // Embedded in SWT, with shared event thread + @SuppressWarnings("removal") boolean isEventThread = AccessController .doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.embed.isEventThread")); if (!isEventThread) { @@ -250,6 +258,7 @@ private void init() { eventProc = result == null ? 0 : result; } + @SuppressWarnings("removal") final boolean disableGrab = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("sun.awt.disablegrab") || Boolean.getBoolean("glass.disableGrab")); @@ -259,6 +268,7 @@ private void init() { @Override protected void runLoop(final Runnable launchable) { // Embedded in SWT, with shared event thread + @SuppressWarnings("removal") final boolean isEventThread = AccessController .doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.embed.isEventThread")); @@ -269,9 +279,11 @@ protected void runLoop(final Runnable launchable) { return; } + @SuppressWarnings("removal") final boolean noErrorTrap = AccessController .doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("glass.noErrorTrap")); + @SuppressWarnings("removal") final Thread toolkitThread = AccessController.doPrivileged((PrivilegedAction) () -> new Thread(() -> { init(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java index 3fff7c0b84e..1890ebf3ded 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java @@ -35,12 +35,12 @@ import java.security.AccessController; import java.security.PrivilegedAction; -@SuppressWarnings("removal") public final class IosApplication extends Application { private static native void _initIDs(); // init IDs for java callbacks from native static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { Application.loadNativeLibrary(); return null; }); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java index c4ed839f363..f5dc2ddb0f3 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java @@ -39,15 +39,16 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -@SuppressWarnings("removal") final class MacApplication extends Application implements InvokeLaterDispatcher.InvokeLaterSubmitter { private native static void _initIDs(boolean disableSyncRendering); static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { Application.loadNativeLibrary(); return null; }); + @SuppressWarnings("removal") boolean disableSyncRendering = AccessController .doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("glass.disableSyncRendering")); @@ -61,6 +62,7 @@ final class MacApplication extends Application implements InvokeLaterDispatcher. MacApplication() { // Embedded in SWT, with shared event thread + @SuppressWarnings("removal") boolean isEventThread = AccessController .doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.embed.isEventThread")); if (!isEventThread) { @@ -89,11 +91,13 @@ protected void runLoop(final Runnable launchable) { launchable.run(); }; - isTaskbarApplication = + @SuppressWarnings("removal") + boolean tmp = AccessController.doPrivileged((PrivilegedAction) () -> { String taskbarAppProp = System.getProperty("glass.taskbarApplication"); return !"false".equalsIgnoreCase(taskbarAppProp); }); + isTaskbarApplication = tmp; ClassLoader classLoader = MacApplication.class.getClassLoader(); _runLoop(classLoader, wrappedRunnable, isTaskbarApplication); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDScreen.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDScreen.java index 93872d35a8a..2654edddc5d 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDScreen.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/EPDScreen.java @@ -89,10 +89,11 @@ class EPDScreen implements NativeScreen { * * @throws IllegalStateException if an error occurs opening the frame buffer */ - @SuppressWarnings("removal") EPDScreen() { - fbPath = AccessController.doPrivileged((PrivilegedAction) () + @SuppressWarnings("removal") + String tmp = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty(FB_PATH_KEY, FB_PATH_DEFAULT)); + fbPath = tmp; try { fbDevice = new EPDFrameBuffer(fbPath); fbDevice.init(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/FBDevScreen.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/FBDevScreen.java index f41efa3d972..f089c6f0483 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/FBDevScreen.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/FBDevScreen.java @@ -54,11 +54,12 @@ class FBDevScreen implements NativeScreen { private LinuxFrameBuffer linuxFB; private final String fbDevPath; - @SuppressWarnings("removal") FBDevScreen() { - fbDevPath = AccessController.doPrivileged( + @SuppressWarnings("removal") + String tmp = AccessController.doPrivileged( (PrivilegedAction) () -> System.getProperty("monocle.screen.fb", "/dev/fb0")); + fbDevPath = tmp; try { linuxFB = new LinuxFrameBuffer(fbDevPath); nativeHandle = 1l; diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/KeyInput.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/KeyInput.java index f9295aabacd..68f0b4735a8 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/KeyInput.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/KeyInput.java @@ -61,7 +61,6 @@ void getState(KeyState result) { * * @param newState The updated key state */ - @SuppressWarnings("removal") void setState(KeyState newState) { if (MonocleSettings.settings.traceEvents) { MonocleTrace.traceEvent("Set %s", newState); @@ -86,7 +85,8 @@ void setState(KeyState newState) { } else if (key == KeyEvent.VK_NUM_LOCK) { numLock = !numLock; } else if (key == KeyEvent.VK_C && newState.isControlPressed()) { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { if ("1".equals(System.getenv("JAVAFX_DEBUG"))) { System.exit(0); } diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxArch.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxArch.java index 9863f0125c7..c469d2b0dfb 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxArch.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxArch.java @@ -28,16 +28,17 @@ import java.security.AccessController; import java.security.PrivilegedAction; -@SuppressWarnings("removal") public class LinuxArch { private static final int bits; static { - bits = AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + int tmp = AccessController.doPrivileged((PrivilegedAction) () -> { LinuxSystem system = LinuxSystem.getLinuxSystem(); return (int) system.sysconf(LinuxSystem._SC_LONG_BIT); }); + bits = tmp; } static boolean is64Bit() { diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxTouchTransform.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxTouchTransform.java index d0d75653430..f3a80adf207 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxTouchTransform.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxTouchTransform.java @@ -114,7 +114,6 @@ int getAxis(LinuxEventBuffer buffer) { } } - @SuppressWarnings("removal") private void initTransform(int axis, int index) { double range; String axisName; @@ -140,7 +139,8 @@ private void initTransform(int axis, int index) { } LinuxAbsoluteInputCapabilities caps = device.getAbsoluteInputCapabilities(axis); String product = device.getProduct(); - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { int minimum = Integer.getInteger( "monocle.input." + product + ".min" + axisName, caps.getMinimum()); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java index fbe7669b377..b6100a67807 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java @@ -36,7 +36,6 @@ import java.security.AccessController; import java.security.PrivilegedAction; -@SuppressWarnings("removal") final class WinApplication extends Application implements InvokeLaterDispatcher.InvokeLaterSubmitter { static float overrideUIScale; @@ -80,7 +79,8 @@ private static float getFloat(String propname, float defval, String description) private static native void initIDs(float overrideUIScale); static { - AccessController.doPrivileged(new PrivilegedAction() { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged(new PrivilegedAction() { public Void run() { verbose = Boolean.getBoolean("javafx.verbose"); if (PrismSettings.allowHiDPIScaling) { @@ -109,6 +109,7 @@ public Void run() { private final InvokeLaterDispatcher invokeLaterDispatcher; WinApplication() { // Embedded in SWT, with shared event thread + @SuppressWarnings("removal") boolean isEventThread = AccessController .doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.embed.isEventThread")); if (!isEventThread) { @@ -135,6 +136,7 @@ private static int getDesiredAwarenesslevel() { if (!PrismSettings.allowHiDPIScaling) { return Process_DPI_Unaware; } + @SuppressWarnings("removal") String awareRequested = AccessController .doPrivileged((PrivilegedAction) () -> System.getProperty("javafx.glass.winDPIawareness")); @@ -156,6 +158,7 @@ private static int getDesiredAwarenesslevel() { @Override protected void runLoop(final Runnable launchable) { + @SuppressWarnings("removal") boolean isEventThread = AccessController .doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.embed.isEventThread")); int awareness = getDesiredAwarenesslevel(); @@ -169,6 +172,7 @@ protected void runLoop(final Runnable launchable) { launchable.run(); return; } + @SuppressWarnings("removal") final Thread toolkitThread = AccessController.doPrivileged((PrivilegedAction) () -> new Thread(() -> { _init(awareness); @@ -350,6 +354,7 @@ protected boolean _supportsTransparentWindows() { public String getDataDirectory() { checkEventThread(); + @SuppressWarnings("removal") String baseDirectory = AccessController.doPrivileged((PrivilegedAction) () -> System.getenv("APPDATA")); if (baseDirectory == null || baseDirectory.length() == 0) { return super.getDataDirectory(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java b/modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java index 8a9b460ece7..102c9c427dc 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java @@ -41,13 +41,13 @@ import java.util.List; import java.util.Locale; -@SuppressWarnings("removal") public class NativeLibLoader { private static final HashSet loaded = new HashSet(); public static synchronized void loadLibrary(String libname) { if (!loaded.contains(libname)) { + @SuppressWarnings("removal") StackWalker walker = AccessController.doPrivileged((PrivilegedAction) () -> StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE)); Class caller = walker.getCallerClass(); @@ -58,6 +58,7 @@ public static synchronized void loadLibrary(String libname) { public static synchronized void loadLibrary(String libname, List dependencies) { if (!loaded.contains(libname)) { + @SuppressWarnings("removal") StackWalker walker = AccessController.doPrivileged((PrivilegedAction) () -> StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE)); Class caller = walker.getCallerClass(); @@ -74,7 +75,8 @@ public static synchronized void loadLibrary(String libname, List depende private static String libSuffix = ""; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { verbose = Boolean.getBoolean("javafx.verbose"); return null; }); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java index c575f951112..34520872564 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java @@ -56,7 +56,6 @@ import com.sun.javafx.stage.StageHelper; -@SuppressWarnings("removal") public class LauncherImpl { /** * When passed as launchMode to launchApplication, tells the method that @@ -119,8 +118,10 @@ public class LauncherImpl { private static ClassLoader savedMainCcl = null; static { - verbose = AccessController.doPrivileged((PrivilegedAction) () -> + @SuppressWarnings("removal") + boolean tmp = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.verbose")); + verbose = tmp; } /** @@ -140,6 +141,7 @@ public static void launchApplication(final Class appClass Class preloaderClass = savedPreloaderClass; if (preloaderClass == null) { + @SuppressWarnings("removal") String preloaderByProperty = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("javafx.preloader")); if (preloaderByProperty != null) { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java index 2cbb6090fba..7b1a9958873 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java @@ -172,7 +172,6 @@ public static void startup(final Runnable r) { * @param r * @param preventDuplicateCalls */ - @SuppressWarnings("removal") public static void startup(final Runnable r, boolean preventDuplicateCalls) { // NOTE: if we ever support re-launching an application and/or @@ -209,7 +208,8 @@ public static void startup(final Runnable r, boolean preventDuplicateCalls) { Logging.getJavaFXLogger().warning(warningStr); } - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { applicationType = System.getProperty("com.sun.javafx.application.type"); if (applicationType == null) applicationType = ""; @@ -264,7 +264,8 @@ public static void startup(final Runnable r, boolean preventDuplicateCalls) { } if (!taskbarApplication) { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy2 = AccessController.doPrivileged((PrivilegedAction) () -> { System.setProperty("glass.taskbarApplication", "false"); return null; }); @@ -430,7 +431,6 @@ public static void runLater(final Runnable r) { runLater(r, false); } - @SuppressWarnings("removal") private static void runLater(final Runnable r, boolean exiting) { if (!initialized.get()) { throw new IllegalStateException("Toolkit not initialized"); @@ -446,11 +446,13 @@ private static void runLater(final Runnable r, boolean exiting) { return; } + @SuppressWarnings("removal") final AccessControlContext acc = AccessController.getContext(); // Don't catch exceptions, they are handled by Toolkit.defer() Toolkit.getToolkit().defer(() -> { try { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { r.run(); return null; }, acc); @@ -789,10 +791,10 @@ private static void _setAccessibilityTheme(String platformTheme) { } } - @SuppressWarnings("removal") private static void _setPlatformUserAgentStylesheet(String stylesheetUrl) { isModena = isCaspian = false; // check for command line override + @SuppressWarnings("removal") final String overrideStylesheetUrl = AccessController.doPrivileged( (PrivilegedAction) () -> System.getProperty("javafx.userAgentStylesheetUrl")); @@ -874,7 +876,8 @@ private static void _setPlatformUserAgentStylesheet(String stylesheetUrl) { uaStylesheets.add(accessibilityTheme); } - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { StyleManager.getInstance().setUserAgentStylesheets(uaStylesheets); return null; }); @@ -898,7 +901,6 @@ public static void addNoTransparencyStylesheetToScene(final Scene scene) { } } - @SuppressWarnings("removal") private static boolean isSupportedImpl(ConditionalFeature feature) { switch (feature) { case GRAPHICS: @@ -917,7 +919,8 @@ private static boolean isSupportedImpl(ConditionalFeature feature) { isMediaSupported = checkForClass( "javafx.scene.media.MediaView"); if (isMediaSupported && PlatformUtil.isEmbedded()) { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { String s = System.getProperty( "com.sun.javafx.experimental.embedded.media", "false"); @@ -932,7 +935,8 @@ private static boolean isSupportedImpl(ConditionalFeature feature) { if (isWebSupported == null) { isWebSupported = checkForClass("javafx.scene.web.WebView"); if (isWebSupported && PlatformUtil.isEmbedded()) { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { String s = System.getProperty( "com.sun.javafx.experimental.embedded.web", "false"); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/AndroidFontFinder.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/AndroidFontFinder.java index 64e9c236403..9cbcaccf56f 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/AndroidFontFinder.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/AndroidFontFinder.java @@ -53,7 +53,6 @@ * defines some basic mappings based on best guess which fonts are mandatory on * platforms lower than 4.0 and how they map to typefaces. */ -@SuppressWarnings("removal") class AndroidFontFinder { private final static String SYSTEM_FONT_NAME = "sans serif"; @@ -64,7 +63,8 @@ class AndroidFontFinder { final static String systemFontsDir = "/system/fonts"; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { NativeLibLoader.loadLibrary("javafx_font"); return null; }); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java index b8c23cd8395..0526d146599 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/DFontDecoder.java @@ -31,10 +31,10 @@ import com.sun.glass.utils.NativeLibLoader; -@SuppressWarnings("removal") class DFontDecoder extends FontFileWriter { static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { NativeLibLoader.loadLibrary("javafx_font"); return null; }); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/Disposer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/Disposer.java index 2986cac7abf..ae073b57fa6 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/Disposer.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/Disposer.java @@ -43,7 +43,6 @@ * * @see DisposerRecord */ -@SuppressWarnings("removal") public class Disposer implements Runnable { private static final ReferenceQueue queue = new ReferenceQueue(); private static final Hashtable records = new Hashtable(); @@ -53,7 +52,8 @@ public class Disposer implements Runnable { disposerInstance = new Disposer(); ThreadGroup tg = Thread.currentThread().getThreadGroup(); - java.security.AccessController.doPrivileged( + @SuppressWarnings("removal") + var dummy = java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { public Object run() { /* The thread must be a member of a thread group diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java index 4340d32ad78..c340192be8f 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java @@ -36,7 +36,6 @@ import java.util.Locale; import java.util.Properties; -@SuppressWarnings("removal") class FontConfigManager { static boolean debugFonts = false; @@ -45,7 +44,8 @@ class FontConfigManager { static boolean useEmbeddedFontSupport = false; static { - AccessController.doPrivileged( + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged( (PrivilegedAction) () -> { String dbg = System.getProperty("prism.debugfonts", ""); debugFonts = "true".equals(dbg); @@ -348,7 +348,8 @@ private static class EmbeddedFontSupport { private static boolean fontDirFromJRE = false; static { - AccessController.doPrivileged( + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged( (PrivilegedAction) () -> { initEmbeddedFonts(); return null; @@ -398,6 +399,7 @@ private static String getStyleStr(int style) { } + @SuppressWarnings("removal") private static boolean exists(final File f) { return AccessController.doPrivileged( (PrivilegedAction) () -> f.exists() @@ -543,7 +545,8 @@ static void initLogicalFonts(FcCompFont[] fonts) { Locale locale) { final Properties props = new Properties(); - AccessController.doPrivileged( + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged( (PrivilegedAction) () -> { try { String lFile = fontDir+"/allfonts.properties"; diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/MacFontFinder.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/MacFontFinder.java index ceaac1e8254..ad44bb45b1e 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/MacFontFinder.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/MacFontFinder.java @@ -33,11 +33,11 @@ import com.sun.glass.utils.NativeLibLoader; -@SuppressWarnings("removal") class MacFontFinder { static { - AccessController.doPrivileged( + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged( (PrivilegedAction) () -> { NativeLibLoader.loadLibrary("javafx_font"); return null; diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java index 7e5d291811b..c1cb098a7d3 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java @@ -46,7 +46,6 @@ import com.sun.javafx.text.GlyphLayout; import static com.sun.javafx.FXPermissions.LOAD_FONT_PERMISSION; -@SuppressWarnings("removal") public abstract class PrismFontFactory implements FontFactory { public static final boolean debugFonts; @@ -94,7 +93,8 @@ public abstract class PrismFontFactory implements FontFactory { isEmbedded = PlatformUtil.isEmbedded(); int[] tempCacheLayoutSize = {0x10000}; - debugFonts = AccessController.doPrivileged( + @SuppressWarnings("removal") + boolean tmp = AccessController.doPrivileged( (PrivilegedAction) () -> { NativeLibLoader.loadLibrary("javafx_font"); String dbg = System.getProperty("prism.debugfonts", ""); @@ -154,6 +154,7 @@ public abstract class PrismFontFactory implements FontFactory { return debug; } ); + debugFonts = tmp; cacheLayoutSize = tempCacheLayoutSize[0]; } @@ -1234,6 +1235,7 @@ static String getPathNameWindows(final String filename) { return sysFontDir+"\\"+filename; } + @SuppressWarnings("removal") String path = AccessController.doPrivileged( new PrivilegedAction() { public String run() { @@ -1412,7 +1414,8 @@ private synchronized void addFileCloserHook() { } } }; - java.security.AccessController.doPrivileged( + @SuppressWarnings("removal") + var dummy = java.security.AccessController.doPrivileged( (PrivilegedAction) () -> { /* The thread must be a member of a thread group * which will not get GCed before VM exit. @@ -1818,6 +1821,7 @@ private synchronized HashMap getFullNameToFileMap() { return fontToFileMap; } + @SuppressWarnings("removal") public final boolean hasPermission() { try { SecurityManager sm = System.getSecurityManager(); @@ -1888,9 +1892,11 @@ void populateFontFileNameMapGeneric(String fontDir) { final File dir = new File(fontDir); String[] files = null; try { - files = AccessController.doPrivileged( + @SuppressWarnings("removal") + String[] tmp = AccessController.doPrivileged( (PrivilegedExceptionAction) () -> dir.list(TTFilter.getInstance()) ); + files = tmp; } catch (Exception e) { } diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/OS.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/OS.java index 169d782cbaa..b63bc803b43 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/OS.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/OS.java @@ -32,10 +32,10 @@ import com.sun.glass.utils.NativeLibLoader; import com.sun.javafx.geom.Path2D; -@SuppressWarnings("removal") class OS { static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { NativeLibLoader.loadLibrary("javafx_font"); return null; }); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java index a9fa709c73c..474bddacd8c 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java @@ -31,10 +31,10 @@ import com.sun.glass.utils.NativeLibLoader; import com.sun.javafx.geom.Path2D; -@SuppressWarnings("removal") class OS { static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { NativeLibLoader.loadLibrary("javafx_font"); return null; }); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSFreetype.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSFreetype.java index 890066f457a..aaa22f48d6b 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSFreetype.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSFreetype.java @@ -30,11 +30,11 @@ import com.sun.glass.utils.NativeLibLoader; import com.sun.javafx.geom.Path2D; -@SuppressWarnings("removal") class OSFreetype { static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { NativeLibLoader.loadLibrary("javafx_font_freetype"); return null; }); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSPango.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSPango.java index 4ac761d5bd4..173b79d9bb7 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSPango.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/OSPango.java @@ -29,11 +29,11 @@ import java.security.PrivilegedAction; import com.sun.glass.utils.NativeLibLoader; -@SuppressWarnings("removal") class OSPango { static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { NativeLibLoader.loadLibrary("javafx_font_pango"); return null; }); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java index a13386c23aa..5f890eaa29d 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java @@ -47,7 +47,6 @@ /** * A loader for images on iOS platform. */ -@SuppressWarnings("removal") public class IosImageLoader extends ImageLoaderImpl { /** These constants must match with those in native */ @@ -110,7 +109,8 @@ public class IosImageLoader extends ImageLoaderImpl { static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { NativeLibLoader.loadLibrary("nativeiio"); return null; }); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java index 0970450056a..e25f0477988 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java @@ -37,7 +37,6 @@ import java.security.AccessController; import java.security.PrivilegedAction; -@SuppressWarnings("removal") public class JPEGImageLoader extends ImageLoaderImpl { // IJG Color codes. @@ -104,7 +103,8 @@ private native int startDecompression(long structPointer, private native boolean decompressIndirect(long structPointer, boolean reportProgress, byte[] array) throws IOException; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { NativeLibLoader.loadLibrary("javafx_iio"); return null; }); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java index bb77f6e21be..5068c176b7e 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java @@ -198,13 +198,13 @@ private static String getDefaultToolkit() { throw new UnsupportedOperationException(System.getProperty("os.name") + " is not supported"); } - @SuppressWarnings("removal") public static synchronized Toolkit getToolkit() { if (TOOLKIT != null) { return TOOLKIT; } - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { // Get the javafx.version and javafx.runtime.version from a preconstructed // java class, VersionInfo, created at build time. VersionInfo.setupSystemProperties(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java index 9a14acf7b2c..0dca686b030 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java @@ -63,14 +63,14 @@ import java.security.AccessController; import java.security.PrivilegedAction; -@SuppressWarnings("removal") class GlassViewEventHandler extends View.EventHandler { static boolean zoomGestureEnabled; static boolean rotateGestureEnabled; static boolean scrollGestureEnabled; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = 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")); scrollGestureEnabled = Boolean.valueOf(System.getProperty("com.sun.javafx.gestures.scroll", "false")); @@ -235,6 +235,7 @@ public Void run() { } } + @SuppressWarnings("removal") @Override public void handleKeyEvent(View view, long time, int type, int key, char[] chars, int modifiers) { @@ -427,6 +428,7 @@ public Void run() { } } + @SuppressWarnings("removal") @Override public void handleMouseEvent(View view, long time, int type, int button, int x, int y, int xAbs, int yAbs, @@ -449,6 +451,7 @@ public void handleMouseEvent(View view, long time, int type, int button, }); } + @SuppressWarnings("removal") @Override public void handleMenuEvent(final View view, final int x, final int y, final int xAbs, final int yAbs, final boolean isKeyboardTrigger) @@ -500,6 +503,7 @@ public void handleMouseEvent(View view, long time, int type, int button, } } + @SuppressWarnings("removal") @Override public void handleScrollEvent(final View view, final long time, final int x, final int y, final int xAbs, final int yAbs, final double deltaX, final double deltaY, final int modifiers, @@ -624,6 +628,7 @@ protected void onChanged(ListChangeListener.Change c) { return composed; } + @SuppressWarnings("removal") @Override public void handleInputMethodEvent(final long time, final String text, final int[] clauseBoundary, final int[] attrBoundary, final byte[] attrValue, @@ -913,6 +918,7 @@ public Void run() { } } + @SuppressWarnings("removal") @Override public void handleViewEvent(View view, long time, final int type) { if (PULSE_LOGGING_ENABLED) { PulseLogger.newInput("VIEW_EVENT: "+ViewEvent.getTypeString(type)); @@ -932,6 +938,7 @@ public Void run() { } } + @SuppressWarnings("removal") @Override public void handleScrollGestureEvent( View view, final long time, final int type, final int modifiers, final boolean isDirect, final boolean isInertia, final int touchCount, @@ -1009,6 +1016,7 @@ public Void run() { } } + @SuppressWarnings("removal") @Override public void handleZoomGestureEvent( View view, final long time, final int type, final int modifiers, final boolean isDirect, final boolean isInertia, @@ -1085,6 +1093,7 @@ public Void run() { } } + @SuppressWarnings("removal") @Override public void handleRotateGestureEvent( View view, final long time, final int type, final int modifiers, final boolean isDirect, final boolean isInertia, @@ -1159,6 +1168,7 @@ public Void run() { } } + @SuppressWarnings("removal") @Override public void handleSwipeGestureEvent( View view, final long time, int type, final int modifiers, final boolean isDirect, @@ -1235,6 +1245,7 @@ public Void run() { } } + @SuppressWarnings("removal") @Override public void handleBeginTouchEvent( View view, final long time, final int modifiers, final boolean isDirect, final int touchEventCount) @@ -1272,6 +1283,7 @@ public Void run() { gestures.notifyBeginTouchEvent(time, modifiers, isDirect, touchEventCount); } + @SuppressWarnings("removal") @Override public void handleNextTouchEvent( View view, final long time, final int type, final long touchId, final int x, final int y, final int xAbs, final int yAbs) @@ -1342,6 +1354,7 @@ public Void run() { gestures.notifyNextTouchEvent(time, type, touchId, x, y, xAbs, yAbs); } + @SuppressWarnings("removal") @Override public void handleEndTouchEvent(View view, long time) { if (PULSE_LOGGING_ENABLED) { PulseLogger.newInput("END_TOUCH_EVENT"); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceLogger.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceLogger.java index 02cac990220..cf2271bc7dc 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceLogger.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/PerformanceLogger.java @@ -73,7 +73,6 @@ * Note: This file a copy for sun.misc.PerformanceLogger before it was moved to * sun.awt.util and JavaFX do not want to be dependent on awt if possible. */ -@SuppressWarnings("removal") public class PerformanceLogger { // Timing values of global interest @@ -88,6 +87,7 @@ public class PerformanceLogger { private static long baseTime; static { + @SuppressWarnings("removal") String perfLoggingProp = java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { @@ -99,6 +99,7 @@ public String run() { perfLoggingOn = true; // Check if we should use nanoTime + @SuppressWarnings("removal") String perfNanoProp = java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { @@ -116,7 +117,8 @@ public String run() { } if (logFileName != null) { if (logWriter == null) { - java.security.AccessController.doPrivileged( + @SuppressWarnings("removal") + var dummy = java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { public Void run() { try { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java index 7e8b6f01e08..c6c6163d03a 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java @@ -247,7 +247,6 @@ boolean get() { private final PerformanceTracker perfTracker = new PerformanceTrackerImpl(); - @SuppressWarnings("removal") @Override public boolean init() { /* * Glass Mac, X11 need Application.setDeviceDetails to happen prior to Glass Application.Run @@ -264,7 +263,8 @@ boolean get() { dispose(); } }; - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { Runtime.getRuntime().addShutdownHook(shutdownHook); return null; }); diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/RotateGestureRecognizer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/RotateGestureRecognizer.java index b5485cc9dc7..76dcc329e78 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/RotateGestureRecognizer.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/RotateGestureRecognizer.java @@ -44,7 +44,6 @@ import javafx.beans.property.DoubleProperty; import javafx.beans.property.SimpleDoubleProperty; -@SuppressWarnings("removal") class RotateGestureRecognizer implements GestureRecognizer { private ViewScene scene; @@ -54,7 +53,8 @@ class RotateGestureRecognizer implements GestureRecognizer { private static double MAX_INITIAL_VELOCITY = 500; private static double ROTATION_INERTIA_MILLIS = 1500; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { String s = System.getProperty("com.sun.javafx.gestures.rotate.threshold"); if (s != null) { ROTATATION_THRESHOLD = Double.valueOf(s); @@ -318,6 +318,7 @@ else if (initialInertiaRotationVelocity < -MAX_INITIAL_VELOCITY) } } + @SuppressWarnings("removal") private void sendRotateStartedEvent() { AccessController.doPrivileged((PrivilegedAction) () -> { if (scene.sceneListener != null) { @@ -336,6 +337,7 @@ private void sendRotateStartedEvent() { }, scene.getAccessControlContext()); } + @SuppressWarnings("removal") private void sendRotateEvent(boolean isInertia) { AccessController.doPrivileged((PrivilegedAction) () -> { if (scene.sceneListener != null) { @@ -353,6 +355,7 @@ private void sendRotateEvent(boolean isInertia) { }, scene.getAccessControlContext()); } + @SuppressWarnings("removal") private void sendRotateFinishedEvent() { AccessController.doPrivileged((PrivilegedAction) () -> { if (scene.sceneListener != null) { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ScrollGestureRecognizer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ScrollGestureRecognizer.java index 3974749166c..9766f533eb1 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ScrollGestureRecognizer.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ScrollGestureRecognizer.java @@ -43,7 +43,6 @@ import javafx.beans.property.DoubleProperty; import javafx.beans.property.SimpleDoubleProperty; -@SuppressWarnings("removal") class ScrollGestureRecognizer implements GestureRecognizer { // gesture will be activated if |scroll amount| > SCROLL_THRESHOLD private static double SCROLL_THRESHOLD = 10; //in pixels @@ -51,7 +50,8 @@ class ScrollGestureRecognizer implements GestureRecognizer { private static double MAX_INITIAL_VELOCITY = 1000; private static double SCROLL_INERTIA_MILLIS = 1500; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { String s = System.getProperty("com.sun.javafx.gestures.scroll.threshold"); if (s != null) { SCROLL_THRESHOLD = Double.valueOf(s); @@ -263,6 +263,7 @@ public void notifyEndTouchEvent(long time) { } } + @SuppressWarnings("removal") private void sendScrollStartedEvent(double xAbs, double yAbs, int touchCount) { AccessController.doPrivileged((PrivilegedAction) () -> { if (scene.sceneListener != null) { @@ -284,6 +285,7 @@ private void sendScrollStartedEvent(double xAbs, double yAbs, int touchCount) { }, scene.getAccessControlContext()); } + @SuppressWarnings("removal") private void sendScrollEvent(boolean isInertia, double xAbs, double yAbs, int touchCount) { AccessController.doPrivileged((PrivilegedAction) () -> { if (scene.sceneListener != null) { @@ -305,6 +307,7 @@ private void sendScrollEvent(boolean isInertia, double xAbs, double yAbs, int to }, scene.getAccessControlContext()); } + @SuppressWarnings("removal") private void sendScrollFinishedEvent(double xAbs, double yAbs, int touchCount) { AccessController.doPrivileged((PrivilegedAction) () -> { if (scene.sceneListener != null) { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ZoomGestureRecognizer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ZoomGestureRecognizer.java index aadb0f33835..ea2e97977b9 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ZoomGestureRecognizer.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/ZoomGestureRecognizer.java @@ -43,7 +43,6 @@ import javafx.beans.property.DoubleProperty; import javafx.beans.property.SimpleDoubleProperty; -@SuppressWarnings("removal") class ZoomGestureRecognizer implements GestureRecognizer { // gesture will be activated if |zoomFactor - 1| > ZOOM_FACTOR_THRESHOLD private static double ZOOM_FACTOR_THRESHOLD = 0.1; @@ -55,7 +54,8 @@ class ZoomGestureRecognizer implements GestureRecognizer { private static double MAX_ZOOM_OUT_FACTOR = 0.1; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { String s = System.getProperty("com.sun.javafx.gestures.zoom.threshold"); if (s != null) { ZOOM_FACTOR_THRESHOLD = Double.valueOf(s); @@ -291,6 +291,7 @@ public void notifyEndTouchEvent(long time) { } } + @SuppressWarnings("removal") private void sendZoomStartedEvent() { AccessController.doPrivileged((PrivilegedAction) () -> { if (scene.sceneListener != null) { @@ -309,6 +310,7 @@ private void sendZoomStartedEvent() { }, scene.getAccessControlContext()); } + @SuppressWarnings("removal") private void sendZoomEvent(boolean isInertia) { AccessController.doPrivileged((PrivilegedAction) () -> { if (scene.sceneListener != null) { @@ -326,6 +328,7 @@ private void sendZoomEvent(boolean isInertia) { }, scene.getAccessControlContext()); } + @SuppressWarnings("removal") private void sendZoomFinishedEvent() { AccessController.doPrivileged((PrivilegedAction) () -> { if (scene.sceneListener != null) { diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/util/ModuleHelper.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/util/ModuleHelper.java index 0d397875942..7807fc28831 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/util/ModuleHelper.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/util/ModuleHelper.java @@ -30,7 +30,6 @@ import java.security.AccessController; import java.security.PrivilegedAction; -@SuppressWarnings("removal") public class ModuleHelper { private static final Method getModuleMethod; private static final Method addReadsMethod; @@ -39,8 +38,10 @@ public class ModuleHelper { private static final boolean verbose; static { - verbose = AccessController.doPrivileged((PrivilegedAction) () -> + @SuppressWarnings("removal") + boolean tmp = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.verbose")); + verbose = tmp; if (verbose) { System.err.println("" + ModuleHelper.class.getName() + " : "); diff --git a/modules/javafx.graphics/src/main/java/com/sun/marlin/OffHeapArray.java b/modules/javafx.graphics/src/main/java/com/sun/marlin/OffHeapArray.java index 88396c1a1e0..ce068b4acfc 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/marlin/OffHeapArray.java +++ b/modules/javafx.graphics/src/main/java/com/sun/marlin/OffHeapArray.java @@ -34,7 +34,6 @@ /** * */ -@SuppressWarnings("removal") final class OffHeapArray { // unsafe reference @@ -43,7 +42,8 @@ final class OffHeapArray { static final int SIZE_INT; static { - UNSAFE = AccessController.doPrivileged(new PrivilegedAction() { + @SuppressWarnings("removal") + Unsafe tmp = AccessController.doPrivileged(new PrivilegedAction() { @Override public Unsafe run() { Unsafe ref = null; @@ -57,6 +57,7 @@ public Unsafe run() { return ref; } }); + UNSAFE = tmp; SIZE_INT = Unsafe.ARRAY_INT_INDEX_SCALE; } diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DPipeline.java b/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DPipeline.java index f0084afa4e1..bbeb5170078 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DPipeline.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DPipeline.java @@ -35,7 +35,6 @@ import java.security.PrivilegedAction; import java.util.List; -@SuppressWarnings("removal") public final class D3DPipeline extends GraphicsPipeline { private static final boolean d3dEnabled; @@ -47,7 +46,8 @@ public final class D3DPipeline extends GraphicsPipeline { static { - d3dEnabled = AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + boolean tmp = AccessController.doPrivileged((PrivilegedAction) () -> { if (PrismSettings.verbose) { System.out.println("Loading D3D native library ..."); } @@ -57,6 +57,7 @@ public final class D3DPipeline extends GraphicsPipeline { } return Boolean.valueOf(nInit(PrismSettings.class, true)); }); + d3dEnabled = tmp; if (PrismSettings.verbose) { System.out.println("Direct3D initialization " + (d3dEnabled ? "succeeded" : "failed")); diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2Pipeline.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2Pipeline.java index 446d3f65dec..95b5489b7f0 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2Pipeline.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2Pipeline.java @@ -36,7 +36,6 @@ import java.security.PrivilegedAction; import java.util.HashMap; -@SuppressWarnings("removal") public class ES2Pipeline extends GraphicsPipeline { public static final GLFactory glFactory; @@ -49,7 +48,8 @@ public class ES2Pipeline extends GraphicsPipeline { private static boolean isEglfb = false; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { String libName = "prism_es2"; String eglType = PlatformUtil.getEmbeddedType(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLFactory.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLFactory.java index 6f5956dd017..c50327efff3 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLFactory.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLFactory.java @@ -31,7 +31,6 @@ import java.security.PrivilegedAction; import java.util.HashMap; -@SuppressWarnings("removal") abstract class GLFactory { private static native boolean @@ -83,8 +82,10 @@ abstract class GLFactory { if (PrismSettings.verbose) { System.out.println("GLFactory using " + factoryClassName); } - platformFactory = factoryClassName == null ? null : + @SuppressWarnings("removal") + GLFactory tmp = factoryClassName == null ? null : AccessController.doPrivileged(new FactoryLoader(factoryClassName)); + platformFactory = tmp; } private static class FactoryLoader implements PrivilegedAction { diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLPixelFormat.java b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLPixelFormat.java index 3ac94b71495..b762217ca29 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLPixelFormat.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/es2/GLPixelFormat.java @@ -29,7 +29,6 @@ import java.security.AccessController; import java.security.PrivilegedAction; -@SuppressWarnings("removal") class GLPixelFormat { final private Attributes attributes; final private long nativeScreen; @@ -38,7 +37,8 @@ class GLPixelFormat { private static int defaultBufferSize; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { defaultDepthSize = Integer.getInteger("prism.glDepthSize", 24); defaultBufferSize = Integer.getInteger("prism.glBufferSize", 32); return null; diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/J2DFontFactory.java b/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/J2DFontFactory.java index 99859306d5c..a45c00533ec 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/J2DFontFactory.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/J2DFontFactory.java @@ -147,7 +147,6 @@ public static void registerFont(final FontResource fr) { }); } - @SuppressWarnings("removal") public PGFont[] loadEmbeddedFont(String name, String path, float size, boolean register, @@ -167,7 +166,8 @@ public PGFont[] loadEmbeddedFont(String name, String path, // REMIND: this needs to be upgraded to use JDK9 createFont // which can handle a collection. final FontResource fr = fonts[0].getFontResource(); - AccessController.doPrivileged(new PrivilegedAction() { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged(new PrivilegedAction() { public Object run() { try { File file = new File(fr.getFileName()); @@ -191,14 +191,14 @@ public Object run() { * subject to change. * ALso this may be just a stop gap measure. */ - @SuppressWarnings("removal") static java.awt.Font getCompositeFont(final java.awt.Font srcFont) { if (PlatformUtil.isMac()) { return srcFont; } synchronized (J2DFontFactory.class) { if (!compositeFontMethodsInitialized) { - AccessController.doPrivileged( + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged( (PrivilegedAction) () -> { compositeFontMethodsInitialized = true; Class fontMgrCls; diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/print/J2DPrinterJob.java b/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/print/J2DPrinterJob.java index b2b8639f5ad..8061edf7c81 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/print/J2DPrinterJob.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/print/J2DPrinterJob.java @@ -89,11 +89,11 @@ import java.security.AccessController; import java.security.PrivilegedAction; -@SuppressWarnings("removal") public class J2DPrinterJob implements PrinterJobImpl { static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { String libName = "prism_common"; if (PrismSettings.verbose) { @@ -117,6 +117,7 @@ public class J2DPrinterJob implements PrinterJobImpl { private volatile Object elo = null; private static Class onTopClass = null; + @SuppressWarnings("removal") PrintRequestAttribute getAlwaysOnTop(final long id) { return AccessController.doPrivileged( (PrivilegedAction) () -> { @@ -792,6 +793,7 @@ public PageLayout validatePageLayout(PageLayout pageLayout) { * to be made before we start the underlying native job. */ private void checkPermissions() { + @SuppressWarnings("removal") SecurityManager security = System.getSecurityManager(); if (security != null) { security.checkPrintJobAccess(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/sw/SWPipeline.java b/modules/javafx.graphics/src/main/java/com/sun/prism/sw/SWPipeline.java index baf526696c3..c78acf22f0c 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/prism/sw/SWPipeline.java +++ b/modules/javafx.graphics/src/main/java/com/sun/prism/sw/SWPipeline.java @@ -35,11 +35,11 @@ import java.util.List; import java.util.HashMap; -@SuppressWarnings("removal") public final class SWPipeline extends GraphicsPipeline { static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { NativeLibLoader.loadLibrary("prism_sw"); return null; }); diff --git a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/ImageData.java b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/ImageData.java index cf6c0f63728..2b20fdfa8c0 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/ImageData.java +++ b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/ImageData.java @@ -42,13 +42,13 @@ * it intended to be used with using * {@link #validate(com.sun.scenario.effect.FilterContext)} method. */ -@SuppressWarnings("removal") public class ImageData { private static HashSet alldatas; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { if (System.getProperty("decora.showleaks") != null) { alldatas = new HashSet(); Runtime.getRuntime().addShutdownHook(new Thread() { diff --git a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/ImagePool.java b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/ImagePool.java index 584619d4cac..c6a9786f203 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/ImagePool.java +++ b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/ImagePool.java @@ -39,7 +39,6 @@ * a fairly expensive operation (in terms of footprint and performance), * especially for the GPU backends, so image reuse is critical. */ -@SuppressWarnings("removal") public class ImagePool { public static long numEffects; @@ -49,7 +48,8 @@ public class ImagePool { static long pixelsAccessed; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { if (System.getProperty("decora.showstats") != null) { Runtime.getRuntime().addShutdownHook(new Thread() { @Override public void run() { diff --git a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSERendererDelegate.java b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSERendererDelegate.java index 90888d61c36..3388956eaf8 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSERendererDelegate.java +++ b/modules/javafx.graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSERendererDelegate.java @@ -32,13 +32,13 @@ import com.sun.scenario.effect.impl.Renderer; import com.sun.scenario.effect.impl.sw.RendererDelegate; -@SuppressWarnings("removal") public class SSERendererDelegate implements RendererDelegate { public static native boolean isSupported(); static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { NativeLibLoader.loadLibrary("decora_sse"); return null; }); diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java index eeb0041eaef..c1b65075d5e 100644 --- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java +++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java @@ -9966,7 +9966,7 @@ Accessible getAccessible() { if (accessible == null) { accessible = Application.GetApplication().createAccessible(); accessible.setEventHandler(new Accessible.EventHandler() { - @SuppressWarnings({"removal","deprecation"}) + @SuppressWarnings("removal") @Override public AccessControlContext getAccessControlContext() { Scene scene = getScene(); if (scene == null) { diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/HostUtils.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/HostUtils.java index 19f7a0b1b8b..52f6985f230 100644 --- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/HostUtils.java +++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/HostUtils.java @@ -31,7 +31,6 @@ /** * Common functions that involve the host platform */ -@SuppressWarnings("removal") public class HostUtils { private static String osName; private static String osArch; @@ -39,7 +38,8 @@ public class HostUtils { private static boolean is64bit = false; static { - embedded = AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + boolean tmp = AccessController.doPrivileged((PrivilegedAction) () -> { osName = System.getProperty("os.name").toLowerCase(); osArch = System.getProperty("os.arch").toLowerCase(); @@ -49,6 +49,7 @@ public class HostUtils { return Boolean.getBoolean("com.sun.javafx.isEmbedded"); }); + embedded = tmp; } public static boolean is64Bit() { diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/PlatformManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/PlatformManager.java index fb58e3be089..95ad8d83b9d 100644 --- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/PlatformManager.java +++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/PlatformManager.java @@ -43,11 +43,11 @@ /** * Core media platform management code. */ -@SuppressWarnings("removal") public final class PlatformManager { private static String enabledPlatforms; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { getPlatformSettings(); return null; }); diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/osx/OSXPlatform.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/osx/OSXPlatform.java index 327b8eb8207..f3d936f1aa3 100644 --- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/osx/OSXPlatform.java +++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/osx/OSXPlatform.java @@ -67,7 +67,6 @@ public final class OSXPlatform extends Platform { "https" }; - @SuppressWarnings("removal") private static final class OSXPlatformInitializer { private static final OSXPlatform globalInstance; static { @@ -75,7 +74,8 @@ private static final class OSXPlatformInitializer { // Do this early so we can report the correct content types boolean isLoaded = false; try { - isLoaded = AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + boolean tmp = AccessController.doPrivileged((PrivilegedAction) () -> { boolean avf = false; boolean qtk = false; // attempt to load the AVFoundation based player first @@ -91,6 +91,7 @@ private static final class OSXPlatformInitializer { return avf || qtk; }); + isLoaded = tmp; } catch (Exception e) { // Ignore } diff --git a/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/Disposer.java b/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/Disposer.java index 007cd36ce65..f5e3b7df907 100644 --- a/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/Disposer.java +++ b/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/Disposer.java @@ -43,7 +43,6 @@ * * @see DisposerRecord */ -@SuppressWarnings("removal") public class Disposer implements Runnable { private static final ReferenceQueue queue = new ReferenceQueue(); private static final Hashtable records = new Hashtable(); @@ -53,7 +52,8 @@ public class Disposer implements Runnable { disposerInstance = new Disposer(); ThreadGroup tg = Thread.currentThread().getThreadGroup(); - java.security.AccessController.doPrivileged( + @SuppressWarnings("removal") + var dummy = java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { public Object run() { /* The thread must be a member of a thread group diff --git a/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/FXDnD.java b/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/FXDnD.java index bc5aece8909..50ca6e8fb09 100644 --- a/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/FXDnD.java +++ b/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/FXDnD.java @@ -41,13 +41,13 @@ * A utility class to connect DnD mechanism of Swing and FX. * It allows Swing content to use the FX machinery for performing DnD. */ -@SuppressWarnings("removal") final public class FXDnD { public static boolean fxAppThreadIsDispatchThread; private FXDnDInteropN fxdndiop; static { - AccessController.doPrivileged(new PrivilegedAction() { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged(new PrivilegedAction() { public Object run() { fxAppThreadIsDispatchThread = "true".equals(System.getProperty("javafx.embed.singleThread")); diff --git a/modules/javafx.swing/src/main/java/javafx/embed/swing/SwingNode.java b/modules/javafx.swing/src/main/java/javafx/embed/swing/SwingNode.java index a99309cb3bf..2d8352299e8 100644 --- a/modules/javafx.swing/src/main/java/javafx/embed/swing/SwingNode.java +++ b/modules/javafx.swing/src/main/java/javafx/embed/swing/SwingNode.java @@ -116,12 +116,12 @@ * * @since JavaFX 8.0 */ -@SuppressWarnings("removal") public class SwingNode extends Node { private static boolean isThreadMerged; static { - AccessController.doPrivileged(new PrivilegedAction() { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged(new PrivilegedAction() { public Object run() { isThreadMerged = Boolean.valueOf( System.getProperty("javafx.embed.singleThread")); @@ -555,6 +555,7 @@ private boolean doComputeContains(double localX, double localY) { locateLwFrame(); }; + @SuppressWarnings("removal") private final EventHandler ungrabHandler = event -> { if (!skipBackwardUnrgabNotification) { if (lwFrame != null) { @@ -882,7 +883,8 @@ public void handle(MouseEvent event) { frame, swingID, swingWhen, swingModifiers, relX, relY, absX, absY, event.getClickCount(), swingPopupTrigger, swingButton); - AccessController.doPrivileged(new PostEventAction(mouseEvent)); + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged(new PostEventAction(mouseEvent)); } } @@ -923,7 +925,8 @@ private void sendMouseWheelEvent(Object source, double fxX, double fxY, int swin int y = (int) Math.round(fxY); MouseWheelEvent mouseWheelEvent = swNodeIOP.createMouseWheelEvent(source, swingModifiers, x, y, -wheelRotation); - AccessController.doPrivileged(new PostEventAction(mouseWheelEvent)); + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged(new PostEventAction(mouseWheelEvent)); } } @@ -968,7 +971,8 @@ public void handle(KeyEvent event) { java.awt.event.KeyEvent keyEvent = swNodeIOP.createKeyEvent(frame, swingID, swingWhen, swingModifiers, swingKeyCode, swingChar); - AccessController.doPrivileged(new PostEventAction(keyEvent)); + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged(new PostEventAction(keyEvent)); } } } diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java index f7f0940fcc9..b08437539df 100644 --- a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java +++ b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java @@ -48,16 +48,17 @@ import com.sun.webkit.graphics.WCPoint; import com.sun.webkit.graphics.WCRectangle; -@SuppressWarnings("removal") public final class WebPageClientImpl implements WebPageClient { private static final boolean backBufferSupported; private static WebConsoleListener consoleListener = null; private final Accessor accessor; static { - backBufferSupported = Boolean.valueOf( + @SuppressWarnings("removal") + boolean tmp = Boolean.valueOf( AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty( "com.sun.webkit.pagebackbuffer", "true"))); + backBufferSupported = tmp; } static void setConsoleListener(WebConsoleListener consoleListener) { diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/Disposer.java b/modules/javafx.web/src/main/java/com/sun/webkit/Disposer.java index 239ab4c87d8..def0f7a2ae4 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/Disposer.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/Disposer.java @@ -52,7 +52,6 @@ * * @see DisposerRecord */ -@SuppressWarnings("removal") public final class Disposer implements Runnable { private static final ReferenceQueue queue = new ReferenceQueue(); private static final Disposer disposerInstance = new Disposer(); @@ -60,7 +59,8 @@ public final class Disposer implements Runnable { new HashSet(); static { - java.security.AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = java.security.AccessController.doPrivileged((PrivilegedAction) () -> { /* * The thread must be a member of a thread group * which will not get GCed before VM exit. diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/WebPage.java b/modules/javafx.web/src/main/java/com/sun/webkit/WebPage.java index 4e6b09f2243..222d66c47b0 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/WebPage.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/WebPage.java @@ -77,7 +77,6 @@ * */ -@SuppressWarnings("removal") public final class WebPage { private final static PlatformLogger log = PlatformLogger.getLogger(WebPage.class.getName()); private final static PlatformLogger paintLog = PlatformLogger.getLogger(WebPage.class.getName() + ".paint"); @@ -101,6 +100,7 @@ public final class WebPage { private final Set frames = new HashSet(); // The access control context associated with this object + @SuppressWarnings("removal") private final AccessControlContext accessControlContext; // Maps load request identifiers to URLs @@ -130,7 +130,8 @@ public final class WebPage { private int updateContentCycleID; static { - AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + var dummy = AccessController.doPrivileged((PrivilegedAction) () -> { NativeLibLoader.loadLibrary("jfxwebkit"); log.finer("jfxwebkit loaded"); @@ -192,7 +193,9 @@ public WebPage(WebPageClient pageClient, this.scrollbarTheme = null; } - accessControlContext = AccessController.getContext(); + @SuppressWarnings("removal") + AccessControlContext tmpAcc = AccessController.getContext(); + accessControlContext = tmpAcc; hostWindow = new WCFrameView(this); pPage = twkCreatePage(editable); @@ -226,6 +229,7 @@ private WCWidget getHostWindow() { * May be called on any thread. * @return the access control context associated with this object */ + @SuppressWarnings("removal") public AccessControlContext getAccessControlContext() { return accessControlContext; } diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java b/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java index 7a740911177..5fb14c8fc5e 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java @@ -369,7 +369,6 @@ private BodySubscriber getBodySubscriber(final String contentEncoding) { createNormalBodySubscriber() : createZIPEncodedBodySubscriber(contentEncoding); } - @SuppressWarnings("removal") private HTTP2Loader(WebPage webPage, ByteBufferPool byteBufferPool, boolean asynchronous, @@ -412,11 +411,13 @@ private HTTP2Loader(WebPage webPage, }; // Run the HttpClient in the page's access control context - this.response = AccessController.doPrivileged((PrivilegedAction>) () -> { + @SuppressWarnings("removal") + CompletableFuture tmpResponse = AccessController.doPrivileged((PrivilegedAction>) () -> { return HTTP_CLIENT.sendAsync(request, bodyHandler) .thenAccept($ -> {}) .exceptionally(ex -> didFail(ex.getCause())); }, webPage.getAccessControlContext()); + this.response = tmpResponse; if (!asynchronous) { waitForRequestToComplete(); diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/network/NetworkContext.java b/modules/javafx.web/src/main/java/com/sun/webkit/network/NetworkContext.java index 55615dde1ee..5cdd3834e01 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/network/NetworkContext.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/network/NetworkContext.java @@ -42,7 +42,6 @@ import com.sun.webkit.WebPage; import java.security.Permission; -@SuppressWarnings("removal") final class NetworkContext { private static final PlatformLogger logger = @@ -93,12 +92,14 @@ final class NetworkContext { new URLLoaderThreadFactory()); threadPool.allowCoreThreadTimeOut(true); - useHTTP2Loader = AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + boolean tmp = AccessController.doPrivileged((PrivilegedAction) () -> { // Use HTTP2 by default on JDK 12 or later final var version = Runtime.Version.parse(System.getProperty("java.version")); final String defaultUseHTTP2 = version.feature() >= 12 ? "true" : "false"; return Boolean.valueOf(System.getProperty("com.sun.webkit.useHTTP2Loader", defaultUseHTTP2)); }); + useHTTP2Loader = tmp; } /** @@ -217,6 +218,7 @@ private static int fwkGetMaximumHTTPConnectionCountPerHost() { // Our implementation employs HttpURLConnection for all // HTTP exchanges, so return the value of the "http.maxConnections" // system property. + @SuppressWarnings("removal") int propValue = AccessController.doPrivileged( (PrivilegedAction) () -> Integer.getInteger("http.maxConnections", -1)); @@ -240,12 +242,14 @@ private static final class URLLoaderThreadFactory implements ThreadFactory { private static final Permission modifyThreadGroupPerm = new RuntimePermission("modifyThreadGroup"); private static final Permission modifyThreadPerm = new RuntimePermission("modifyThread"); + @SuppressWarnings("removal") private URLLoaderThreadFactory() { SecurityManager sm = System.getSecurityManager(); group = (sm != null) ? sm.getThreadGroup() : Thread.currentThread().getThreadGroup(); } + @SuppressWarnings("removal") @Override public Thread newThread(Runnable r) { // Assert the modifyThread and modifyThreadGroup permissions diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/network/URLs.java b/modules/javafx.web/src/main/java/com/sun/webkit/network/URLs.java index b82ca85daa2..eeb79844d30 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/network/URLs.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/network/URLs.java @@ -80,7 +80,6 @@ public static URL newURL(String spec) throws MalformedURLException { * @throws MalformedURLException if no protocol is specified, or an * unknown protocol is found. */ - @SuppressWarnings("removal") public static URL newURL(final URL context, final String spec) throws MalformedURLException { @@ -100,13 +99,15 @@ public static URL newURL(final URL context, final String spec) try { // We should be able to specify one of our stream handlers for the URL // when running as an applet or a web start app. - return AccessController.doPrivileged((PrivilegedAction) () -> { + @SuppressWarnings("removal") + URL result = AccessController.doPrivileged((PrivilegedAction) () -> { try { return new URL(context, spec, handler); } catch (MalformedURLException muex) { throw new RuntimeException(muex); } }, null, streamHandlerPermission); + return result; } catch (RuntimeException re) { if (re.getCause() instanceof MalformedURLException) { From 84775ff5f935ec643526d73e1f172804ea724fcb Mon Sep 17 00:00:00 2001 From: Kevin Rushforth Date: Fri, 4 Jun 2021 09:09:42 -0700 Subject: [PATCH 5/5] Address review feedback --- .../src/main/java/com/sun/glass/ui/Screen.java | 10 +++------- .../java/com/sun/glass/ui/monocle/LinuxArch.java | 15 +++++---------- .../com/sun/javafx/application/LauncherImpl.java | 11 +++-------- .../com/sun/javafx/webkit/WebPageClientImpl.java | 13 ++++--------- .../java/com/sun/webkit/network/HTTP2Loader.java | 2 +- .../com/sun/webkit/network/NetworkContext.java | 2 +- 6 files changed, 17 insertions(+), 36 deletions(-) diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java index 8fdb95a3944..b0ea5980b55 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java @@ -37,13 +37,9 @@ public final class Screen { private static volatile List screens = null ; // If dpiOverride is non-zero, use its value as screen DPI - private static final int dpiOverride; - - static { - @SuppressWarnings("removal") - int tmp = AccessController.doPrivileged((PrivilegedAction) () -> Integer.getInteger("com.sun.javafx.screenDPI", 0)).intValue(); - dpiOverride = tmp; - } + @SuppressWarnings("removal") + private static final int dpiOverride = AccessController.doPrivileged((PrivilegedAction) () -> + Integer.getInteger("com.sun.javafx.screenDPI", 0)).intValue(); public static class EventHandler { public void handleSettingsChanged() { diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxArch.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxArch.java index c469d2b0dfb..0aaa194cbba 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxArch.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxArch.java @@ -30,16 +30,11 @@ public class LinuxArch { - private static final int bits; - - static { - @SuppressWarnings("removal") - int tmp = AccessController.doPrivileged((PrivilegedAction) () -> { - LinuxSystem system = LinuxSystem.getLinuxSystem(); - return (int) system.sysconf(LinuxSystem._SC_LONG_BIT); - }); - bits = tmp; - } + @SuppressWarnings("removal") + private static final int bits = AccessController.doPrivileged((PrivilegedAction) () -> { + LinuxSystem system = LinuxSystem.getLinuxSystem(); + return (int) system.sysconf(LinuxSystem._SC_LONG_BIT); + });; static boolean is64Bit() { return bits == 64; diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java index 34520872564..59958d04883 100644 --- a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java +++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java @@ -81,7 +81,9 @@ public class LauncherImpl { private static final boolean trace = false; // set system property javafx.verbose to true to make the launcher noisy - private static final boolean verbose; + @SuppressWarnings("removal") + private static final boolean verbose = AccessController.doPrivileged((PrivilegedAction) () -> + Boolean.getBoolean("javafx.verbose")); private static final String MF_MAIN_CLASS = "Main-Class"; private static final String MF_JAVAFX_MAIN = "JavaFX-Application-Class"; @@ -117,13 +119,6 @@ public class LauncherImpl { // is started. private static ClassLoader savedMainCcl = null; - static { - @SuppressWarnings("removal") - boolean tmp = AccessController.doPrivileged((PrivilegedAction) () -> - Boolean.getBoolean("javafx.verbose")); - verbose = tmp; - } - /** * This method is called by the Application.launch method. * It must not be called more than once or an exception will be thrown. diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java index b08437539df..308928f031c 100644 --- a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java +++ b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java @@ -49,18 +49,13 @@ import com.sun.webkit.graphics.WCRectangle; public final class WebPageClientImpl implements WebPageClient { - private static final boolean backBufferSupported; + @SuppressWarnings("removal") + private static final boolean backBufferSupported = Boolean.valueOf( + AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty( + "com.sun.webkit.pagebackbuffer", "true"))); private static WebConsoleListener consoleListener = null; private final Accessor accessor; - static { - @SuppressWarnings("removal") - boolean tmp = Boolean.valueOf( - AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty( - "com.sun.webkit.pagebackbuffer", "true"))); - backBufferSupported = tmp; - } - static void setConsoleListener(WebConsoleListener consoleListener) { WebPageClientImpl.consoleListener = consoleListener; } diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java b/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java index 5fb14c8fc5e..a308a46d82d 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java @@ -412,7 +412,7 @@ private HTTP2Loader(WebPage webPage, // Run the HttpClient in the page's access control context @SuppressWarnings("removal") - CompletableFuture tmpResponse = AccessController.doPrivileged((PrivilegedAction>) () -> { + var tmpResponse = AccessController.doPrivileged((PrivilegedAction>) () -> { return HTTP_CLIENT.sendAsync(request, bodyHandler) .thenAccept($ -> {}) .exceptionally(ex -> didFail(ex.getCause())); diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/network/NetworkContext.java b/modules/javafx.web/src/main/java/com/sun/webkit/network/NetworkContext.java index 5cdd3834e01..4de09305e05 100644 --- a/modules/javafx.web/src/main/java/com/sun/webkit/network/NetworkContext.java +++ b/modules/javafx.web/src/main/java/com/sun/webkit/network/NetworkContext.java @@ -242,8 +242,8 @@ private static final class URLLoaderThreadFactory implements ThreadFactory { private static final Permission modifyThreadGroupPerm = new RuntimePermission("modifyThreadGroup"); private static final Permission modifyThreadPerm = new RuntimePermission("modifyThread"); - @SuppressWarnings("removal") private URLLoaderThreadFactory() { + @SuppressWarnings("removal") SecurityManager sm = System.getSecurityManager(); group = (sm != null) ? sm.getThreadGroup() : Thread.currentThread().getThreadGroup();