From 143f796e57aa46ba18da1e05b45958ad6778d618 Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Wed, 10 Jan 2007 16:55:10 +0000 Subject: [PATCH] URL.java: Removed. 2007-01-10 Gary Benson * java/net/URL.java: Removed. * sources.am, Makefile.in: Rebuilt. From-SVN: r120644 --- 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 bcmey$@|9)7KSst?lm9c?Gp?O%&twJwS;`03 delta 19 bcmey$@|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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 literal 10393 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 diff --git a/libjava/java/net/URL.h b/libjava/java/net/URL.h index 536d89ca1fb9..f0553c968bcc 100644 --- a/libjava/java/net/URL.h +++ b/libjava/java/net/URL.h @@ -34,6 +34,9 @@ public: URL(::java::lang::String *); URL(::java::net::URL *, ::java::lang::String *); URL(::java::net::URL *, ::java::lang::String *, ::java::net::URLStreamHandler *); +private: + URL(::java::net::URL *, ::java::lang::String *, ::java::net::URLStreamHandler *, jboolean); +public: jboolean equals(::java::lang::Object *); ::java::lang::Object * getContent(); ::java::lang::Object * getContent(JArray< ::java::lang::Class * > *); 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 \