From 3de198441d96c3313172e620987bcc4537cfcef8 Mon Sep 17 00:00:00 2001 From: gary Date: Wed, 10 Jan 2007 16:55:10 +0000 Subject: [PATCH] 2007-01-10 Gary Benson * java/net/URL.java: Removed. * sources.am, Makefile.in: Rebuilt. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120644 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 + libjava/Makefile.in | 2 +- libjava/classpath/lib/java/net/URL$1.class | Bin 629 -> 629 bytes libjava/classpath/lib/java/net/URL.class | Bin 10393 -> 10907 bytes libjava/java/net/URL.h | 3 + libjava/java/net/URL.java | 974 --------------------- libjava/sources.am | 2 +- 7 files changed, 10 insertions(+), 976 deletions(-) delete mode 100644 libjava/java/net/URL.java diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 252ad06487dc..2e1fb0487482 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2007-01-10 Gary Benson + + * java/net/URL.java: Removed. + * sources.am, Makefile.in: Rebuilt. + 2007-01-10 Matthias Klose * Makefile.am (install-exec-hook): Support $(DESTDIR). diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 17a7ed0afe7d..bae8e2244513 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -4395,7 +4395,7 @@ classpath/java/net/SocketPermission.java \ classpath/java/net/SocketTimeoutException.java \ classpath/java/net/URI.java \ classpath/java/net/URISyntaxException.java \ -java/net/URL.java \ +classpath/java/net/URL.java \ java/net/URLClassLoader.java \ classpath/java/net/URLConnection.java \ classpath/java/net/URLDecoder.java \ diff --git a/libjava/classpath/lib/java/net/URL$1.class b/libjava/classpath/lib/java/net/URL$1.class index 7520f56903de076053f8e5bb00b75fda4b1c0aa1..b4932208003a26135932e55697d13218d3d2cb94 100644 GIT binary patch delta 19 bc-s5Q@|9)7KSst?lm9c?Gp?O%&twJwS;`03 delta 19 bc-s5Q@|9)7KSsv($^RMc8M`LiGnoMZSDFWr diff --git a/libjava/classpath/lib/java/net/URL.class b/libjava/classpath/lib/java/net/URL.class index 0603d68c390673137ab74e396f21ea8b564cbeab..8eb71fda53ddbd687efd63032e92ffffd1cc15d5 100644 GIT binary patch literal 10907 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 HzKi?~uEXV_ literal 10393 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 *); diff --git a/libjava/java/net/URL.java b/libjava/java/net/URL.java deleted file mode 100644 index 0ae7c1cfb96e..000000000000 --- a/libjava/java/net/URL.java +++ /dev/null @@ -1,974 +0,0 @@ -/* URL.java -- Uniform Resource Locator Class - Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -package java.net; - -import gnu.java.net.URLParseError; - -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.HashMap; -import java.util.StringTokenizer; - - -/* - * Written using on-line Java Platform 1.2 API Specification, as well - * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998). - * Status: Believed complete and correct. - */ - -/** - * This final class represents an Internet Uniform Resource Locator (URL). - * For details on the syntax of URL's and what they can be used for, - * refer to RFC 1738, available from - * http://ds.internic.net/rfcs/rfc1738.txt - *

- * There are a great many protocols supported by URL's such as "http", - * "ftp", and "file". This object can handle any arbitrary URL for which - * a URLStreamHandler object can be written. Default protocol handlers - * are provided for the "http" and "ftp" protocols. Additional protocols - * handler implementations may be provided in the future. In any case, - * an application or applet can install its own protocol handlers that - * can be "chained" with other protocol hanlders in the system to extend - * the base functionality provided with this class. (Note, however, that - * unsigned applets cannot access properties by default or install their - * own protocol handlers). - *

- * This chaining is done via the system property java.protocol.handler.pkgs - * If this property is set, it is assumed to be a "|" separated list of - * package names in which to attempt locating protocol handlers. The - * protocol handler is searched for by appending the string - * ".<protocol>.Handler" to each packed in the list until a hander is - * found. If a protocol handler is not found in this list of packages, or if - * the property does not exist, then the default protocol handler of - * "gnu.java.net.<protocol>.Handler" is tried. If this is - * unsuccessful, a MalformedURLException is thrown. - *

- * All of the constructor methods of URL attempt to load a protocol - * handler and so any needed protocol handlers must be installed when - * the URL is constructed. - *

- * Here is an example of how URL searches for protocol handlers. Assume - * the value of java.protocol.handler.pkgs is "com.foo|com.bar" and the - * URL is "news://comp.lang.java.programmer". URL would looking the - * following places for protocol handlers: - * 

-  * com.foo.news.Handler
-  * com.bar.news.Handler
-  * gnu.java.net.news.Handler
-  *

- * If the protocol handler is not found in any of those locations, a - * MalformedURLException would be thrown. - *

- * Please note that a protocol handler must be a subclass of - * URLStreamHandler. - *

- * Normally, this class caches protocol handlers. Once it finds a handler - * for a particular protocol, it never tries to look up a new handler - * again. However, if the system property - * gnu.java.net.nocache_protocol_handlers is set, then this - * caching behavior is disabled. This property is specific to this - * implementation. Sun's JDK may or may not do protocol caching, but it - * almost certainly does not examine this property. - *

- * Please also note that an application can install its own factory for - * loading protocol handlers (see setURLStreamHandlerFactory). If this is - * done, then the above information is superseded and the behavior of this - * class in loading protocol handlers is dependent on that factory. - * - * @author Aaron M. Renn (arenn@urbanophile.com) - * @author Warren Levy (warrenl@cygnus.com) - * - * @see URLStreamHandler - */ -public final class URL implements Serializable -{ - private static final String DEFAULT_SEARCH_PATH = - "gnu.java.net.protocol|gnu.inet"; - - // Cached System ClassLoader - private static ClassLoader systemClassLoader; - - /** - * The name of the protocol for this URL. - * The protocol is always stored in lower case. - */ - private String protocol; - - /** - * The "authority" portion of the URL. - */ - private String authority; - - /** - * The hostname or IP address of this protocol. - * This includes a possible user. For example joe@some.host.net. - */ - private String host; - - /** - * The user information necessary to establish the connection. - */ - private String userInfo; - - /** - * The port number of this protocol or -1 if the port number used is - * the default for this protocol. - */ - private int port = -1; // Initialize for constructor using context. - - /** - * The "file" portion of the URL. It is defined as path[?query]. - */ - private String file; - - /** - * The anchor portion of the URL. - */ - private String ref; - - /** - * This is the hashCode for this URL - */ - private int hashCode; - - /** - * The protocol handler in use for this URL - */ - transient URLStreamHandler ph; - - /** - * If an application installs its own protocol handler factory, this is - * where we keep track of it. - */ - private static URLStreamHandlerFactory factory; - private static final long serialVersionUID = -7627629688361524110L; - - /** - * This a table where we cache protocol handlers to avoid the overhead - * of looking them up each time. - */ - private static HashMap ph_cache = new HashMap(); - - /** - * Whether or not to cache protocol handlers. - */ - private static boolean cache_handlers; - - static - { - String s = System.getProperty("gnu.java.net.nocache_protocol_handlers"); - - if (s == null) - cache_handlers = true; - else - cache_handlers = false; - } - - /** - * Constructs a URL and loads a protocol handler for the values passed as - * arguments. - * - * @param protocol The protocol for this URL ("http", "ftp", etc) - * @param host The hostname or IP address to connect to - * @param port The port number to use, or -1 to use the protocol's - * default port - * @param file The "file" portion of the URL. - * - * @exception MalformedURLException If a protocol handler cannot be loaded or - * a parse error occurs. - */ - public URL(String protocol, String host, int port, String file) - throws MalformedURLException - { - this(protocol, host, port, file, null); - } - - /** - * Constructs a URL and loads a protocol handler for the values passed in - * as arugments. Uses the default port for the protocol. - * - * @param protocol The protocol for this URL ("http", "ftp", etc) - * @param host The hostname or IP address for this URL - * @param file The "file" portion of this URL. - * - * @exception MalformedURLException If a protocol handler cannot be loaded or - * a parse error occurs. - */ - public URL(String protocol, String host, String file) - throws MalformedURLException - { - this(protocol, host, -1, file, null); - } - - /** - * This method initializes a new instance of URL with the - * specified protocol, host, port, and file. Additionally, this method - * allows the caller to specify a protocol handler to use instead of - * the default. If this handler is specified, the caller must have - * the "specifyStreamHandler" permission (see NetPermission) - * or a SecurityException will be thrown. - * - * @param protocol The protocol for this URL ("http", "ftp", etc) - * @param host The hostname or IP address to connect to - * @param port The port number to use, or -1 to use the protocol's default - * port - * @param file The "file" portion of the URL. - * @param ph The protocol handler to use with this URL. - * - * @exception MalformedURLException If no protocol handler can be loaded - * for the specified protocol. - * @exception SecurityException If the SecurityManager exists - * and does not allow the caller to specify its own protocol handler. - * - * @since 1.2 - */ - public URL(String protocol, String host, int port, String file, - URLStreamHandler ph) throws MalformedURLException - { - if (protocol == null) - throw new MalformedURLException("null protocol"); - protocol = protocol.toLowerCase(); - this.protocol = protocol; - - if (ph != null) - { - SecurityManager s = System.getSecurityManager(); - if (s != null) - s.checkPermission(new NetPermission("specifyStreamHandler")); - - this.ph = ph; - } - else - this.ph = getURLStreamHandler(protocol); - - if (this.ph == null) - throw new MalformedURLException("Protocol handler not found: " - + protocol); - - this.host = host; - this.port = port; - this.authority = (host != null) ? host : ""; - if (port >= 0 && host != null) - this.authority += ":" + port; - - int hashAt = file.indexOf('#'); - if (hashAt < 0) - { - this.file = file; - this.ref = null; - } - else - { - this.file = file.substring(0, hashAt); - this.ref = file.substring(hashAt + 1); - } - hashCode = hashCode(); // Used for serialization. - } - - /** - * Initializes a URL from a complete string specification such as - * "http://www.urbanophile.com/arenn/". First the protocol name is parsed - * out of the string. Then a handler is located for that protocol and - * the parseURL() method of that protocol handler is used to parse the - * remaining fields. - * - * @param spec The complete String representation of a URL - * - * @exception MalformedURLException If a protocol handler cannot be found - * or the URL cannot be parsed - */ - public URL(String spec) throws MalformedURLException - { - this((URL) null, spec != null ? spec : "", (URLStreamHandler) null); - } - - /** - * This method parses a String representation of a URL within the - * context of an existing URL. Principally this means that any - * fields not present the URL are inheritied from the context URL. - * This allows relative URL's to be easily constructed. If the - * context argument is null, then a complete URL must be specified - * in the URL string. If the protocol parsed out of the URL is - * different from the context URL's protocol, then then URL String - * is also expected to be a complete URL. - * - * @param context The context on which to parse the specification - * @param spec The string to parse an URL - * - * @exception MalformedURLException If a protocol handler cannot be found - * for the URL cannot be parsed - */ - public URL(URL context, String spec) throws MalformedURLException - { - this(context, spec, (URLStreamHandler) null); - } - - /** - * Creates an URL from given arguments - * This method parses a String representation of a URL within the - * context of an existing URL. Principally this means that any fields - * not present the URL are inheritied from the context URL. This allows - * relative URL's to be easily constructed. If the context argument is - * null, then a complete URL must be specified in the URL string. - * If the protocol parsed out of the URL is different - * from the context URL's protocol, then then URL String is also - * expected to be a complete URL. - *

- * Additionally, this method allows the caller to specify a protocol handler - * to use instead of the default. If this handler is specified, the caller - * must have the "specifyStreamHandler" permission - * (see NetPermission) or a SecurityException - * will be thrown. - * - * @param context The context in which to parse the specification - * @param spec The string to parse as an URL - * @param ph The stream handler for the URL - * - * @exception MalformedURLException If a protocol handler cannot be found - * or the URL cannot be parsed - * @exception SecurityException If the SecurityManager exists - * and does not allow the caller to specify its own protocol handler. - * - * @since 1.2 - */ - public URL(URL context, String spec, URLStreamHandler ph) - throws MalformedURLException - { - /* A protocol is defined by the doc as the substring before a ':' - * as long as the ':' occurs before any '/'. - * - * If context is null, then spec must be an absolute URL. - * - * The relative URL need not specify all the components of a URL. - * If the protocol, host name, or port number is missing, the value - * is inherited from the context. A bare file component is appended - * to the context's file. The optional anchor is not inherited. - */ - - // If this is an absolute URL, then ignore context completely. - // An absolute URL must have chars prior to "://" but cannot have a colon - // right after the "://". The second colon is for an optional port value - // and implies that the host from the context is used if available. - int colon; - int slash = spec.indexOf('/'); - if ((colon = spec.indexOf("://", 1)) > 0 - && ((colon < slash || slash < 0)) - && ! spec.regionMatches(colon, "://:", 0, 4)) - context = null; - - if ((colon = spec.indexOf(':')) > 0 - && (colon < slash || slash < 0)) - { - // Protocol specified in spec string. - protocol = spec.substring(0, colon).toLowerCase(); - if (context != null && context.protocol.equals(protocol)) - { - // The 1.2 doc specifically says these are copied to the new URL. - host = context.host; - port = context.port; - userInfo = context.userInfo; - authority = context.authority; - } - } - else if (context != null) - { - // Protocol NOT specified in spec string. - // Use context fields (except ref) as a foundation for relative URLs. - colon = -1; - protocol = context.protocol; - host = context.host; - port = context.port; - userInfo = context.userInfo; - if (spec.indexOf(":/", 1) < 0) - { - file = context.file; - if (file == null || file.length() == 0) - file = "/"; - } - authority = context.authority; - } - else // Protocol NOT specified in spec. and no context available. - throw new MalformedURLException("Absolute URL required with null" - + " context: " + spec); - - protocol = protocol.trim(); - - if (ph != null) - { - SecurityManager s = System.getSecurityManager(); - if (s != null) - s.checkPermission(new NetPermission("specifyStreamHandler")); - - this.ph = ph; - } - else - this.ph = getURLStreamHandler(protocol); - - if (this.ph == null) - throw new MalformedURLException("Protocol handler not found: " - + protocol); - - // JDK 1.2 doc for parseURL specifically states that any '#' ref - // is to be excluded by passing the 'limit' as the indexOf the '#' - // if one exists, otherwise pass the end of the string. - int hashAt = spec.indexOf('#', colon + 1); - - try - { - this.ph.parseURL(this, spec, colon + 1, - hashAt < 0 ? spec.length() : hashAt); - } - catch (URLParseError e) - { - throw new MalformedURLException(e.getMessage()); - } - - if (hashAt >= 0) - ref = spec.substring(hashAt + 1); - - hashCode = hashCode(); // Used for serialization. - } - - /** - * Test another URL for equality with this one. This will be true only if - * the argument is non-null and all of the fields in the URL's match - * exactly (ie, protocol, host, port, file, and ref). Overrides - * Object.equals(), implemented by calling the equals method of the handler. - * - * @param obj The URL to compare with - * - * @return true if the URL is equal, false otherwise - */ - public boolean equals(Object obj) - { - if (! (obj instanceof URL)) - return false; - - return ph.equals(this, (URL) obj); - } - - /** - * Returns the contents of this URL as an object by first opening a - * connection, then calling the getContent() method against the connection - * - * @return A content object for this URL - * @exception IOException If opening the connection or getting the - * content fails. - * - * @since 1.3 - */ - public Object getContent() throws IOException - { - return openConnection().getContent(); - } - - /** - * Gets the contents of this URL - * - * @param classes The allow classes for the content object. - * - * @return a context object for this URL. - * - * @exception IOException If an error occurs - */ - public Object getContent(Class[] classes) throws IOException - { - // FIXME: implement this - return getContent(); - } - - /** - * Returns the file portion of the URL. - * Defined as path[?query]. - * Returns the empty string if there is no file portion. - * - * @return The filename specified in this URL, or an empty string if empty. - */ - public String getFile() - { - return file == null ? "" : file; - } - - /** - * Returns the path of the URL. This is the part of the file before any '?' - * character. - * - * @return The path specified in this URL, or null if empty. - * - * @since 1.3 - */ - public String getPath() - { - // The spec says we need to return an empty string, but some - // applications depends on receiving null when the path is empty. - if (file == null) - return null; - int quest = file.indexOf('?'); - return quest < 0 ? getFile() : file.substring(0, quest); - } - - /** - * Returns the authority of the URL - * - * @return The authority specified in this URL. - * - * @since 1.3 - */ - public String getAuthority() - { - return authority; - } - - /** - * Returns the host of the URL - * - * @return The host specified in this URL. - */ - public String getHost() - { - int at = (host == null) ? -1 : host.indexOf('@'); - return at < 0 ? host : host.substring(at + 1, host.length()); - } - - /** - * Returns the port number of this URL or -1 if the default port number is - * being used. - * - * @return The port number - * - * @see #getDefaultPort() - */ - public int getPort() - { - return port; - } - - /** - * Returns the default port of the URL. If the StreamHandler for the URL - * protocol does not define a default port it returns -1. - * - * @return The default port of the current protocol. - */ - public int getDefaultPort() - { - return ph.getDefaultPort(); - } - - /** - * Returns the protocol of the URL - * - * @return The specified protocol. - */ - public String getProtocol() - { - return protocol; - } - - /** - * Returns the ref (sometimes called the "# reference" or "anchor") portion - * of the URL. - * - * @return The ref - */ - public String getRef() - { - return ref; - } - - /** - * Returns the user information of the URL. This is the part of the host - * name before the '@'. - * - * @return the user at a particular host or null when no user defined. - */ - public String getUserInfo() - { - if (userInfo != null) - return userInfo; - int at = (host == null) ? -1 : host.indexOf('@'); - return at < 0 ? null : host.substring(0, at); - } - - /** - * Returns the query of the URL. This is the part of the file before the - * '?'. - * - * @return the query part of the file, or null when there is no query part. - */ - public String getQuery() - { - int quest = (file == null) ? -1 : file.indexOf('?'); - return quest < 0 ? null : file.substring(quest + 1, file.length()); - } - - /** - * Returns a hashcode computed by the URLStreamHandler of this URL - * - * @return The hashcode for this URL. - */ - public int hashCode() - { - if (hashCode != 0) - return hashCode; // Use cached value if available. - else - return ph.hashCode(this); - } - - /** - * Returns a URLConnection object that represents a connection to the remote - * object referred to by the URL. The URLConnection is created by calling the - * openConnection() method of the protocol handler - * - * @return A URLConnection for this URL - * - * @exception IOException If an error occurs - */ - public URLConnection openConnection() throws IOException - { - return ph.openConnection(this); - } - - /** - * Opens a connection to this URL and returns an InputStream for reading - * from that connection - * - * @return An InputStream for this URL. - * - * @exception IOException If an error occurs - */ - public InputStream openStream() throws IOException - { - return openConnection().getInputStream(); - } - - /** - * Tests whether or not another URL refers to the same "file" as this one. - * This will be true if and only if the passed object is not null, is a - * URL, and matches all fields but the ref (ie, protocol, host, port, - * and file); - * - * @param url The URL object to test with - * - * @return true if URL matches this URL's file, false otherwise - */ - public boolean sameFile(URL url) - { - return ph.sameFile(this, url); - } - - /** - * Sets the specified fields of the URL. This is not a public method so - * that only URLStreamHandlers can modify URL fields. This might be called - * by the parseURL() method in that class. URLs are otherwise - * constant. If the given protocol does not exist, it will keep the previously - * set protocol. - * - * @param protocol The protocol name for this URL - * @param host The hostname or IP address for this URL - * @param port The port number of this URL - * @param file The "file" portion of this URL. - * @param ref The anchor portion of this URL. - */ - protected void set(String protocol, String host, int port, String file, - String ref) - { - URLStreamHandler protocolHandler = null; - protocol = protocol.toLowerCase(); - if (! this.protocol.equals(protocol)) - protocolHandler = getURLStreamHandler(protocol); - - // It is an hidden feature of the JDK. If the protocol does not exist, - // we keep the previously initialized protocol. - if (protocolHandler != null) - { - this.ph = protocolHandler; - this.protocol = protocol; - } - this.authority = ""; - this.port = port; - this.host = host; - this.file = file; - this.ref = ref; - - if (host != null) - this.authority += host; - if (port >= 0) - this.authority += ":" + port; - - hashCode = hashCode(); // Used for serialization. - } - - /** - * Sets the specified fields of the URL. This is not a public method so - * that only URLStreamHandlers can modify URL fields. URLs are otherwise - * constant. If the given protocol does not exist, it will keep the previously - * set protocol. - * - * @param protocol The protocol name for this URL. - * @param host The hostname or IP address for this URL. - * @param port The port number of this URL. - * @param authority The authority of this URL. - * @param userInfo The user and password (if needed) of this URL. - * @param path The "path" portion of this URL. - * @param query The query of this URL. - * @param ref The anchor portion of this URL. - * - * @since 1.3 - */ - protected void set(String protocol, String host, int port, String authority, - String userInfo, String path, String query, String ref) - { - URLStreamHandler protocolHandler = null; - protocol = protocol.toLowerCase(); - if (! this.protocol.equals(protocol)) - protocolHandler = getURLStreamHandler(protocol); - - // It is an hidden feature of the JDK. If the protocol does not exist, - // we keep the previously initialized protocol. - if (protocolHandler != null) - { - this.ph = protocolHandler; - this.protocol = protocol; - } - this.host = host; - this.userInfo = userInfo; - this.port = port; - this.authority = authority; - if (query == null) - this.file = path; - else - this.file = path + "?" + query; - this.ref = ref; - hashCode = hashCode(); // Used for serialization. - } - - /** - * Sets the URLStreamHandlerFactory for this class. This factory is - * responsible for returning the appropriate protocol handler for - * a given URL. - * - * @param fac The URLStreamHandlerFactory class to use - * - * @exception Error If the factory is alread set. - * @exception SecurityException If a security manager exists and its - * checkSetFactory method doesn't allow the operation - */ - public static synchronized void setURLStreamHandlerFactory(URLStreamHandlerFactory fac) - { - if (factory != null) - throw new Error("URLStreamHandlerFactory already set"); - - // Throw an exception if an extant security mgr precludes - // setting the factory. - SecurityManager s = System.getSecurityManager(); - if (s != null) - s.checkSetFactory(); - factory = fac; - } - - /** - * Returns a String representing this URL. The String returned is - * created by calling the protocol handler's toExternalForm() method. - * - * @return A string for this URL - */ - public String toExternalForm() - { - // Identical to toString(). - return ph.toExternalForm(this); - } - - /** - * Returns a String representing this URL. Identical to toExternalForm(). - * The value returned is created by the protocol handler's - * toExternalForm method. Overrides Object.toString() - * - * @return A string for this URL - */ - public String toString() - { - // Identical to toExternalForm(). - return ph.toExternalForm(this); - } - - /** - * This internal method is used in two different constructors to load - * a protocol handler for this URL. - * - * @param protocol The protocol to load a handler for - * - * @return A URLStreamHandler for this protocol, or null when not found. - */ - private static synchronized URLStreamHandler getURLStreamHandler(String protocol) - { - URLStreamHandler ph = null; - - // First, see if a protocol handler is in our cache. - if (cache_handlers) - { - if ((ph = (URLStreamHandler) ph_cache.get(protocol)) != null) - return ph; - } - - // If a non-default factory has been set, use it to find the protocol. - if (factory != null) - { - ph = factory.createURLStreamHandler(protocol); - } - else if (protocol.equals("core")) - { - ph = new gnu.java.net.protocol.core.Handler(); - } - else if (protocol.equals("file")) - { - // This is an interesting case. It's tempting to think that we - // could call Class.forName ("gnu.java.net.protocol.file.Handler") to - // get the appropriate class. Unfortunately, if we do that the - // program will never terminate, because getURLStreamHandler is - // eventually called by Class.forName. - // - // Treating "file" as a special case is the minimum that will - // fix this problem. If other protocols are required in a - // statically linked application they will need to be handled in - // the same way as "file". - ph = new gnu.java.net.protocol.file.Handler(); - } - - // Non-default factory may have returned null or a factory wasn't set. - // Use the default search algorithm to find a handler for this protocol. - if (ph == null) - { - // Get the list of packages to check and append our default handler - // to it, along with the JDK specified default as a last resort. - // Except in very unusual environments the JDK specified one shouldn't - // ever be needed (or available). - String ph_search_path = - System.getProperty("java.protocol.handler.pkgs"); - - // Tack our default package on at the ends. - if (ph_search_path != null) - ph_search_path += "|" + DEFAULT_SEARCH_PATH; - else - ph_search_path = DEFAULT_SEARCH_PATH; - - // Finally loop through our search path looking for a match. - StringTokenizer pkgPrefix = new StringTokenizer(ph_search_path, "|"); - - // Cache the systemClassLoader - if (systemClassLoader == null) - { - systemClassLoader = (ClassLoader) AccessController.doPrivileged - (new PrivilegedAction() { - public Object run() - { - return ClassLoader.getSystemClassLoader(); - } - }); - } - - do - { - try - { - // Try to get a class from the system/application - // classloader, initialize it, make an instance - // and try to cast it to a URLStreamHandler. - String clsName = - (pkgPrefix.nextToken() + "." + protocol + ".Handler"); - Class c = Class.forName(clsName, true, systemClassLoader); - ph = (URLStreamHandler) c.newInstance(); - } - catch (ThreadDeath death) - { - throw death; - } - catch (Throwable t) - { - // Ignored. - } - } - while (ph == null && pkgPrefix.hasMoreTokens()); - } - - // Update the hashtable with the new protocol handler. - if (ph != null && cache_handlers) - ph_cache.put(protocol, ph); - else - ph = null; - - return ph; - } - - private void readObject(ObjectInputStream ois) - throws IOException, ClassNotFoundException - { - ois.defaultReadObject(); - this.ph = getURLStreamHandler(protocol); - if (this.ph == null) - throw new IOException("Handler for protocol " + protocol + " not found"); - } - - private void writeObject(ObjectOutputStream oos) throws IOException - { - oos.defaultWriteObject(); - } - - /** - * Returns the equivalent URI object for this URL. - * This is the same as calling new URI(this.toString()). - * RFC2396-compliant URLs are guaranteed a successful conversion to - * a URI instance. However, there are some values which - * form valid URLs, but which do not also form RFC2396-compliant URIs. - * - * @throws URISyntaxException if this URL is not RFC2396-compliant, - * and thus can not be successfully converted to a URI. - */ - public URI toURI() - throws URISyntaxException - { - return new URI(toString()); - } - -} diff --git a/libjava/sources.am b/libjava/sources.am index d49e91e3a7fd..fea09f26961c 100644 --- a/libjava/sources.am +++ b/libjava/sources.am @@ -4845,7 +4845,7 @@ classpath/java/net/SocketPermission.java \ classpath/java/net/SocketTimeoutException.java \ classpath/java/net/URI.java \ classpath/java/net/URISyntaxException.java \ -java/net/URL.java \ +classpath/java/net/URL.java \ java/net/URLClassLoader.java \ classpath/java/net/URLConnection.java \ classpath/java/net/URLDecoder.java \ -- 2.47.3