changeset 5991:93303f8a4a8e

8000941: Remove ftp from the required list of protocol handlers Reviewed-by: chegar
author alanb
date Sat, 20 Oct 2012 21:07:50 +0100
parents 21f1b88e68ce
children a40b0f51613b
files src/share/classes/java/net/ProxySelector.java src/share/classes/java/net/URL.java src/share/classes/java/net/URLStreamHandler.java src/share/classes/java/net/package.html
diffstat 4 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/net/ProxySelector.java	Fri Oct 19 20:36:36 2012 -0700
+++ b/src/share/classes/java/net/ProxySelector.java	Sat Oct 20 21:07:50 2012 +0100
@@ -127,7 +127,6 @@
      * <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>
--- a/src/share/classes/java/net/URL.java	Fri Oct 19 20:36:36 2012 -0700
+++ b/src/share/classes/java/net/URL.java	Sat Oct 20 21:07:50 2012 +0100
@@ -274,7 +274,7 @@
      * <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.
--- a/src/share/classes/java/net/URLStreamHandler.java	Fri Oct 19 20:36:36 2012 -0700
+++ b/src/share/classes/java/net/URLStreamHandler.java	Sat Oct 20 21:07:50 2012 +0100
@@ -37,8 +37,7 @@
  * 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
--- a/src/share/classes/java/net/package.html	Fri Oct 19 20:36:36 2012 -0700
+++ b/src/share/classes/java/net/package.html	Sat Oct 20 21:07:50 2012 +0100
@@ -72,7 +72,7 @@
 <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>