# HG changeset patch
# User kcr
# Date 1523399717 25200
# Tue Apr 10 15:35:17 2018 -0700
# Node ID 1b4e044ab87db2840e14e25457700ec727c59505
# Parent 4184d3dccefa820f639dfd70394031471e19e9da
8199357: Remove references to applets and Java Web Start from FX
Reviewed-by:
diff --git a/apps/samples/samples_readme.txt b/apps/samples/samples_readme.txt
--- a/apps/samples/samples_readme.txt
+++ b/apps/samples/samples_readme.txt
@@ -6,7 +6,6 @@
What do I need to set up my environment?
How do I run the prebuilt samples?
How do I run the sample projects in NetBeans IDE?
-What are the other ways I can package the samples?
Sample Descriptions
@@ -48,7 +47,7 @@
- A supported version** of the JDK.
- A supported version** of NetBeans IDE.
-**To find information about the supported versions of operating system and browser
+**To find information about the supported versions of operating system
for a particular Java release, see
http://www.oracle.com/technetwork/java/javase/downloads/index.html
@@ -77,16 +76,6 @@
the project and choose Run.
-==================================================
-What are the other ways I can package the samples?
-==================================================
-
-You can also package any of the samples as an applet, JNLP, or native bundle
-that includes an installer and a copy of the JRE for execution in an environment
-that does not have JavaFX installed. See https://docs.oracle.com/javafx for
-additional information about deploying JavaFX application.
-
-
===================
Sample Descriptions
===================
@@ -138,4 +127,4 @@
--------------------------------------------------------------------
-Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/HostServicesDelegate.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/HostServicesDelegate.java
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/HostServicesDelegate.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/HostServicesDelegate.java
@@ -27,50 +27,13 @@
import java.awt.Desktop;
import java.io.File;
-import java.lang.reflect.Method;
import java.net.URI;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
import javafx.application.Application;
public abstract class HostServicesDelegate {
- private static Method getInstanceMeth = null;
-
public static HostServicesDelegate getInstance(final Application app) {
- // Call into the deploy code to get the delegate class
- HostServicesDelegate instance = null;
- try {
- instance = AccessController.doPrivileged(
- (PrivilegedExceptionAction
* NOTE: this method should not be called from the Application constructor, @@ -429,8 +427,7 @@ /** * Encapsulates the set of parameters for an application. This includes - * arguments passed on the command line, unnamed parameters specified - * in a JNLP file, and <name,value> pairs specified in a JNLP file. + * arguments passed on the command line. * *
* Note that the application and the preloader both get the same set @@ -450,8 +447,8 @@ * Retrieves a read-only list of the raw arguments. This list * may be empty, but is never null. In the case of a standalone * application, it is the ordered list of arguments specified on the - * command line. In the case of an applet or WebStart application, - * it includes unnamed parameters as well as named parameters. For + * command line. + * For * named parameters, each <name,value> pair is represented as * a single argument of the form: "--name=value". * @@ -472,8 +469,7 @@ /** * Retrieves a read-only map of the named parameters. It may be * empty, but is never null. - * Named parameters include those <name,value> pairs explicitly - * specified in a JNLP file. It also includes any command line + * Named parameters include any command line * arguments of the form: "--name=value". * * @return a read-only map of named parameters. diff --git a/modules/javafx.graphics/src/main/java/javafx/application/HostServices.java b/modules/javafx.graphics/src/main/java/javafx/application/HostServices.java --- a/modules/javafx.graphics/src/main/java/javafx/application/HostServices.java +++ b/modules/javafx.graphics/src/main/java/javafx/application/HostServices.java @@ -51,9 +51,7 @@ /** * Gets the code base URI for this application. - * If the application was launched via a JNLP file, this method returns - * the codebase parameter specified in the JNLP file. - * If the application was launched in standalone mode, this method returns + * This method returns * the directory containing the application jar file. If the * application is not packaged in a jar file, this method * returns the empty string. @@ -66,12 +64,7 @@ /** * Gets the document base URI for this application. - * If the application is embedded in a browser, this method returns the - * URI of the web page containing the application. - * If the application was launched in webstart mode, this method returns - * the the codebase parameter specified in the JNLP file (the document - * base and the code base are the same in this mode). - * If the application was launched in standalone mode, this method returns + * This method returns * the URI of the current directory. * * @return the document base URI for this application. diff --git a/modules/javafx.graphics/src/main/java/javafx/application/Platform.java b/modules/javafx.graphics/src/main/java/javafx/application/Platform.java --- a/modules/javafx.graphics/src/main/java/javafx/application/Platform.java +++ b/modules/javafx.graphics/src/main/java/javafx/application/Platform.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -192,9 +192,6 @@ * method, then the Application stop method may not be called. * *
This method may be called from any thread.
- * - *Note: if the application is embedded in a browser, then this method - * may have no effect. */ public static void exit() { PlatformImpl.exit(); diff --git a/modules/javafx.graphics/src/main/java/javafx/application/Preloader.java b/modules/javafx.graphics/src/main/java/javafx/application/Preloader.java --- a/modules/javafx.graphics/src/main/java/javafx/application/Preloader.java +++ b/modules/javafx.graphics/src/main/java/javafx/application/Preloader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,8 +32,7 @@ * Class that is extended to define an optional preloader for a * JavaFX Application. * An application may contain a preloader that is used - * to improve the application loading experience, especially for applications - * that are embedded in a browser or launched in webstart execution mode. + * to improve the application loading experience. * *
* A preloader is a small application that is started @@ -76,12 +75,8 @@ * Custom preloader implementations should follow these rules: *
*@@ -215,7 +210,7 @@ /** * Preloader notification that reports an error. - * This is delivered to preloader in case of problem with applet startup. + * This is delivered to preloader in case of problem with application startup. * @since JavaFX 2.0 */ public static class ErrorNotification implements PreloaderNotification { diff --git a/modules/javafx.graphics/src/main/java/javafx/concurrent/Task.java b/modules/javafx.graphics/src/main/java/javafx/concurrent/Task.java --- a/modules/javafx.graphics/src/main/java/javafx/concurrent/Task.java +++ b/modules/javafx.graphics/src/main/java/javafx/concurrent/Task.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1002,7 +1002,7 @@ // Need to assert the modifyThread permission so an app can cancel // a task that it created (the default executor for the service runs in // its own thread group) - // Note that this is needed when running as an applet or a web start app. + // Note that this is needed when running with a security manager. private static final Permission modifyThreadPerm = new RuntimePermission("modifyThread"); @Override public boolean cancel(boolean mayInterruptIfRunning) { diff --git a/modules/javafx.graphics/src/main/java/javafx/stage/Stage.java b/modules/javafx.graphics/src/main/java/javafx/stage/Stage.java --- a/modules/javafx.graphics/src/main/java/javafx/stage/Stage.java +++ b/modules/javafx.graphics/src/main/java/javafx/stage/Stage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -313,8 +313,7 @@ } /* - * sets this stage to be the primary stage. - * When run as an applet, this stage will appear in the broswer + * Sets this stage to be the primary stage. */ void setPrimary(boolean primary) { this.primary = primary; @@ -322,7 +321,6 @@ /* * Returns whether this stage is the primary stage. - * When run as an applet, the primary stage will appear in the broswer * * @return true if this stage is the primary stage for the application. */ diff --git a/modules/javafx.graphics/src/main/java/javafx/stage/Window.java b/modules/javafx.graphics/src/main/java/javafx/stage/Window.java --- a/modules/javafx.graphics/src/main/java/javafx/stage/Window.java +++ b/modules/javafx.graphics/src/main/java/javafx/stage/Window.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -74,7 +74,7 @@ /** * A top level window within which a scene is hosted, and with which the user * interacts. A Window might be a {@link Stage}, {@link PopupWindow}, or other - * such top level. A Window is used also for browser plug-in based deployments. + * such top level window. *
* Window objects must be constructed and modified on the * JavaFX Application Thread.