From 6f199eeb4e9eedbf9821bc1924b0d14503dcbad4 Mon Sep 17 00:00:00 2001
From: alanb <unknown>
Date: Sat, 20 Oct 2012 21:07:50 +0100
Subject: [PATCH] 8000941: Remove ftp from the required list of protocol
 handlers Reviewed-by: chegar

---
 src/share/classes/java/net/ProxySelector.java    | 1 -
 src/share/classes/java/net/URL.java              | 2 +-
 src/share/classes/java/net/URLStreamHandler.java | 3 +--
 src/share/classes/java/net/package.html          | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/share/classes/java/net/ProxySelector.java b/src/share/classes/java/net/ProxySelector.java
index 88f24a210..97d19a142 100644
--- a/src/share/classes/java/net/ProxySelector.java
+++ b/src/share/classes/java/net/ProxySelector.java
@@ -127,7 +127,6 @@ public abstract class ProxySelector {
      * <UL>
      * <LI>http URI for http connections</LI>
      * <LI>https URI for https connections
-     * <LI>ftp URI for ftp connections</LI>
      * <LI><code>socket://host:port</code><br>
      *     for tcp client sockets connections</LI>
      * </UL>
diff --git a/src/share/classes/java/net/URL.java b/src/share/classes/java/net/URL.java
index e7e9ddacc..5cb3f6d63 100644
--- a/src/share/classes/java/net/URL.java
+++ b/src/share/classes/java/net/URL.java
@@ -274,7 +274,7 @@ public final class URL implements java.io.Serializable {
      * <p>Protocol handlers for the following protocols are guaranteed
      * to exist on the search path :-
      * <blockquote><pre>
-     *     http, https, ftp, file, and jar
+     *     http, https, file, and jar
      * </pre></blockquote>
      * Protocol handlers for additional protocols may also be
      * available.
diff --git a/src/share/classes/java/net/URLStreamHandler.java b/src/share/classes/java/net/URLStreamHandler.java
index c98588a0e..ba7fa263c 100644
--- a/src/share/classes/java/net/URLStreamHandler.java
+++ b/src/share/classes/java/net/URLStreamHandler.java
@@ -37,8 +37,7 @@ import sun.net.www.ParseUtil;
  * The abstract class <code>URLStreamHandler</code> is the common
  * superclass for all stream protocol handlers. A stream protocol
  * handler knows how to make a connection for a particular protocol
- * type, such as <code>http</code>, <code>ftp</code>, or
- * <code>gopher</code>.
+ * type, such as <code>http</code> or <code>https</code>.
  * <p>
  * In most cases, an instance of a <code>URLStreamHandler</code>
  * subclass is not created directly by an application. Rather, the
diff --git a/src/share/classes/java/net/package.html b/src/share/classes/java/net/package.html
index b5bd261be..2cd8a2494 100644
--- a/src/share/classes/java/net/package.html
+++ b/src/share/classes/java/net/package.html
@@ -72,7 +72,7 @@ Provides the classes for implementing networking applications.
 <ul>
       <li>{@link java.net.URI} is the class representing a Universal Resource Identifier, as specified in RFC 2396. As the name indicates, this is just an Identifier and doesn't provide directly the means to access the resource.</li>
       <li>{@link java.net.URL} is the class representing a Universal Resource Locator, which is both an older concept for URIs and a means to access the resources.</li>
-      <li>{@link java.net.URLConnection} is created from a URL and is the communication link used to access the resource pointed by the URL. This abstract class will delegate most of the work to the underlying protocol handlers like http or ftp.</li>
+      <li>{@link java.net.URLConnection} is created from a URL and is the communication link used to access the resource pointed by the URL. This abstract class will delegate most of the work to the underlying protocol handlers like http or https.</li>
       <li>{@link java.net.HttpURLConnection} is a subclass of URLConnection and provides some additional functionalities specific to the HTTP protocol.</li>
 </ul>
 <p>The recommended usage is to use {@link java.net.URI} to identify resources, then convert it into a {@link java.net.URL} when it is time to access the resource. From that URL, you can either get the {@link java.net.URLConnection} for fine control, or get directly the InputStream.<p>
-- 
GitLab