BindException.java, [...]: Big import statement and @author tag cleanup.
2004-10-17 Michael Koch <konqueror@gmx.de>
* java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Big import statement and @author tag cleanup.
From-SVN: r89168
2004-10-17 08:29:57 +00:00
|
|
|
/* URI.java - An URI class --
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
|
2002-10-05 07:49:08 +00:00
|
|
|
|
|
|
|
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.
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
|
2002-10-05 07:49:08 +00:00
|
|
|
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., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
02111-1307 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 java.io.IOException;
|
|
|
|
import java.io.ObjectInputStream;
|
|
|
|
import java.io.ObjectOutputStream;
|
|
|
|
import java.io.Serializable;
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
import java.util.regex.Matcher;
|
|
|
|
import java.util.regex.Pattern;
|
2002-10-05 07:49:08 +00:00
|
|
|
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
|
2002-10-05 07:49:08 +00:00
|
|
|
/**
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
* @author Ito Kazumitsu (ito.kazumitsu@hitachi-cable.co.jp)
|
|
|
|
* @author Dalibor Topic (robilad@kaffe.org)
|
|
|
|
* @author Michael Koch (konqueror@gmx.de)
|
2002-10-05 07:49:08 +00:00
|
|
|
* @since 1.4
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public final class URI implements Comparable, Serializable
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
|
|
|
static final long serialVersionUID = -6052424284110960213L;
|
|
|
|
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
/**
|
|
|
|
* Regular expression for parsing URIs.
|
|
|
|
*
|
|
|
|
* Taken from RFC 2396, Appendix B.
|
|
|
|
* This expression doesn't parse IPv6 addresses.
|
|
|
|
*/
|
|
|
|
private static final String URI_REGEXP =
|
|
|
|
"^(([^:/?#]+):)?((//([^/?#]*))?([^?#]*)(\\?([^#]*))?)?(#(.*))?";
|
|
|
|
|
2004-03-21 10:54:46 +00:00
|
|
|
/**
|
|
|
|
* Valid characters (taken from rfc2396)
|
|
|
|
*/
|
|
|
|
private static final String RFC2396_DIGIT = "0123456789";
|
|
|
|
private static final String RFC2396_LOWALPHA = "abcdefghijklmnopqrstuvwxyz";
|
|
|
|
private static final String RFC2396_UPALPHA = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
private static final String RFC2396_ALPHA =
|
|
|
|
RFC2396_LOWALPHA + RFC2396_UPALPHA;
|
2004-03-21 10:54:46 +00:00
|
|
|
private static final String RFC2396_ALPHANUM = RFC2396_DIGIT + RFC2396_ALPHA;
|
|
|
|
private static final String RFC2396_MARK = "-_.!~*'()";
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
private static final String RFC2396_UNRESERVED =
|
|
|
|
RFC2396_ALPHANUM + RFC2396_MARK;
|
|
|
|
private static final String RFC2396_REG_NAME =
|
|
|
|
RFC2396_UNRESERVED + "$,;:@&=+";
|
2004-03-21 10:54:46 +00:00
|
|
|
private static final String RFC2396_PCHAR = RFC2396_UNRESERVED + ":@&=+$,";
|
|
|
|
private static final String RFC2396_SEGMENT = RFC2396_PCHAR + ";";
|
|
|
|
private static final String RFC2396_PATH_SEGMENTS = RFC2396_SEGMENT + "/";
|
|
|
|
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
/**
|
|
|
|
* Index of scheme component in parsed URI.
|
|
|
|
*/
|
|
|
|
private static final int SCHEME_GROUP = 2;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Index of scheme-specific-part in parsed URI.
|
|
|
|
*/
|
|
|
|
private static final int SCHEME_SPEC_PART_GROUP = 3;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Index of authority component in parsed URI.
|
|
|
|
*/
|
|
|
|
private static final int AUTHORITY_GROUP = 5;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Index of path component in parsed URI.
|
|
|
|
*/
|
|
|
|
private static final int PATH_GROUP = 6;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Index of query component in parsed URI.
|
|
|
|
*/
|
|
|
|
private static final int QUERY_GROUP = 8;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Index of fragment component in parsed URI.
|
|
|
|
*/
|
|
|
|
private static final int FRAGMENT_GROUP = 10;
|
2004-08-18 18:05:39 +00:00
|
|
|
private transient String scheme;
|
|
|
|
private transient String rawSchemeSpecificPart;
|
|
|
|
private transient String schemeSpecificPart;
|
|
|
|
private transient String rawAuthority;
|
|
|
|
private transient String authority;
|
|
|
|
private transient String rawUserInfo;
|
|
|
|
private transient String userInfo;
|
|
|
|
private transient String rawHost;
|
|
|
|
private transient String host;
|
|
|
|
private transient int port;
|
|
|
|
private transient String rawPath;
|
|
|
|
private transient String path;
|
|
|
|
private transient String rawQuery;
|
|
|
|
private transient String query;
|
|
|
|
private transient String rawFragment;
|
|
|
|
private transient String fragment;
|
|
|
|
private String string;
|
2002-10-05 07:49:08 +00:00
|
|
|
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
private void readObject(ObjectInputStream is)
|
2002-10-05 07:49:08 +00:00
|
|
|
throws ClassNotFoundException, IOException
|
|
|
|
{
|
2004-08-18 18:05:39 +00:00
|
|
|
this.string = (String) is.readObject();
|
|
|
|
try
|
BindException.java, [...]: Big import statement and @author tag cleanup.
2004-10-17 Michael Koch <konqueror@gmx.de>
* java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Big import statement and @author tag cleanup.
From-SVN: r89168
2004-10-17 08:29:57 +00:00
|
|
|
{
|
|
|
|
parseURI(this.string);
|
|
|
|
}
|
2004-08-18 18:05:39 +00:00
|
|
|
catch (URISyntaxException x)
|
BindException.java, [...]: Big import statement and @author tag cleanup.
2004-10-17 Michael Koch <konqueror@gmx.de>
* java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Big import statement and @author tag cleanup.
From-SVN: r89168
2004-10-17 08:29:57 +00:00
|
|
|
{
|
|
|
|
// Should not happen.
|
|
|
|
throw new RuntimeException(x);
|
|
|
|
}
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
2004-08-18 18:05:39 +00:00
|
|
|
private void writeObject(ObjectOutputStream os) throws IOException
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
2004-08-18 18:05:39 +00:00
|
|
|
if (string == null)
|
|
|
|
string = toString();
|
|
|
|
os.writeObject(string);
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
private static String getURIGroup(Matcher match, int group)
|
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
String matched = match.group(group);
|
|
|
|
return matched.length() == 0 ? null : matched;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets fields of this URI by parsing the given string.
|
|
|
|
*
|
|
|
|
* @param str The string to parse
|
|
|
|
*
|
|
|
|
* @exception URISyntaxException If the given string violates RFC 2396
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
private void parseURI(String str) throws URISyntaxException
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
Pattern pattern = Pattern.compile(URI_REGEXP);
|
|
|
|
Matcher matcher = pattern.matcher(str);
|
|
|
|
if (matcher.matches())
|
|
|
|
{
|
|
|
|
scheme = getURIGroup(matcher, SCHEME_GROUP);
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
rawSchemeSpecificPart = getURIGroup(matcher, SCHEME_SPEC_PART_GROUP);
|
2004-03-21 10:54:46 +00:00
|
|
|
rawAuthority = getURIGroup(matcher, AUTHORITY_GROUP);
|
|
|
|
rawPath = getURIGroup(matcher, PATH_GROUP);
|
|
|
|
rawQuery = getURIGroup(matcher, QUERY_GROUP);
|
|
|
|
rawFragment = getURIGroup(matcher, FRAGMENT_GROUP);
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
}
|
|
|
|
else
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
throw new URISyntaxException(str, "doesn't match URI regular expression");
|
|
|
|
|
2004-03-21 10:54:46 +00:00
|
|
|
// We must eagerly unquote the parts, because this is the only time
|
|
|
|
// we may throw an exception.
|
|
|
|
schemeSpecificPart = unquote(rawSchemeSpecificPart);
|
|
|
|
authority = unquote(rawAuthority);
|
|
|
|
path = unquote(rawPath);
|
|
|
|
query = unquote(rawQuery);
|
|
|
|
fragment = unquote(rawFragment);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Unquote "%" + hex quotes characters
|
|
|
|
*
|
|
|
|
* @param str The string to unquote or null.
|
|
|
|
*
|
|
|
|
* @return The unquoted string or null if str was null.
|
|
|
|
*
|
|
|
|
* @exception URISyntaxException If the given string contains invalid
|
|
|
|
* escape sequences.
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
private static String unquote(String str) throws URISyntaxException
|
2004-03-21 10:54:46 +00:00
|
|
|
{
|
|
|
|
if (str == null)
|
|
|
|
return null;
|
|
|
|
byte[] buf = new byte[str.length()];
|
|
|
|
int pos = 0;
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
for (int i = 0; i < str.length(); i++)
|
|
|
|
{
|
|
|
|
char c = str.charAt(i);
|
|
|
|
if (c > 127)
|
2004-03-21 10:54:46 +00:00
|
|
|
throw new URISyntaxException(str, "Invalid character");
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
if (c == '%')
|
|
|
|
{
|
|
|
|
if (i + 2 >= str.length())
|
|
|
|
throw new URISyntaxException(str, "Invalid quoted character");
|
|
|
|
String hex = "0123456789ABCDEF";
|
|
|
|
int hi = hex.indexOf(str.charAt(++i));
|
|
|
|
int lo = hex.indexOf(str.charAt(++i));
|
|
|
|
if (lo < 0 || hi < 0)
|
|
|
|
throw new URISyntaxException(str, "Invalid quoted character");
|
|
|
|
buf[pos++] = (byte) (hi * 16 + lo);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
buf[pos++] = (byte) c;
|
|
|
|
}
|
|
|
|
try
|
|
|
|
{
|
|
|
|
return new String(buf, 0, pos, "utf-8");
|
|
|
|
}
|
|
|
|
catch (java.io.UnsupportedEncodingException x2)
|
|
|
|
{
|
|
|
|
throw (Error) new InternalError().initCause(x2);
|
2004-03-21 10:54:46 +00:00
|
|
|
}
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Quote characters illegal in URIs in given string.
|
|
|
|
*
|
|
|
|
* Replace illegal characters by encoding their UTF-8
|
|
|
|
* representation as "%" + hex code for each resulting
|
|
|
|
* UTF-8 character.
|
|
|
|
*
|
|
|
|
* @param str The string to quote
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
*
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
* @return The quoted string.
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
private static String quote(String str)
|
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
// FIXME: unimplemented.
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Quote characters illegal in URI authorities in given string.
|
|
|
|
*
|
|
|
|
* Replace illegal characters by encoding their UTF-8
|
|
|
|
* representation as "%" + hex code for each resulting
|
|
|
|
* UTF-8 character.
|
|
|
|
*
|
|
|
|
* @param str The string to quote
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
*
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
* @return The quoted string.
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
private static String quoteAuthority(String str)
|
|
|
|
{
|
2004-03-21 10:54:46 +00:00
|
|
|
// Technically, we should be using RFC2396_AUTHORITY, but
|
|
|
|
// it contains no additional characters.
|
|
|
|
return quote(str, RFC2396_REG_NAME);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Quote characters in str that are not part of legalCharacters.
|
|
|
|
*
|
|
|
|
* Replace illegal characters by encoding their UTF-8
|
|
|
|
* representation as "%" + hex code for each resulting
|
|
|
|
* UTF-8 character.
|
|
|
|
*
|
|
|
|
* @param str The string to quote
|
|
|
|
* @param legalCharacters The set of legal characters
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
*
|
2004-03-21 10:54:46 +00:00
|
|
|
* @return The quoted string.
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
private static String quote(String str, String legalCharacters)
|
2004-03-21 10:54:46 +00:00
|
|
|
{
|
|
|
|
StringBuffer sb = new StringBuffer(str.length());
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
for (int i = 0; i < str.length(); i++)
|
|
|
|
{
|
|
|
|
char c = str.charAt(i);
|
|
|
|
if (legalCharacters.indexOf(c) == -1)
|
|
|
|
{
|
|
|
|
String hex = "0123456789ABCDEF";
|
|
|
|
if (c <= 127)
|
|
|
|
sb.append('%').append(hex.charAt(c / 16)).append(hex.charAt(c % 16));
|
|
|
|
else
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
// this is far from optimal, but it works
|
|
|
|
byte[] utf8 = str.substring(i, i + 1).getBytes("utf-8");
|
|
|
|
for (int j = 0; j < utf8.length; j++)
|
|
|
|
sb.append('%').append(hex.charAt((utf8[j] & 0xff) / 16))
|
|
|
|
.append(hex.charAt((utf8[j] & 0xff) % 16));
|
|
|
|
}
|
|
|
|
catch (java.io.UnsupportedEncodingException x)
|
|
|
|
{
|
|
|
|
throw (Error) new InternalError().initCause(x);
|
|
|
|
}
|
|
|
|
}
|
2004-03-21 10:54:46 +00:00
|
|
|
}
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
else
|
|
|
|
sb.append(c);
|
2004-03-21 10:54:46 +00:00
|
|
|
}
|
|
|
|
return sb.toString();
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Quote characters illegal in URI hosts in given string.
|
|
|
|
*
|
|
|
|
* Replace illegal characters by encoding their UTF-8
|
|
|
|
* representation as "%" + hex code for each resulting
|
|
|
|
* UTF-8 character.
|
|
|
|
*
|
|
|
|
* @param str The string to quote
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
*
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
* @return The quoted string.
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
private static String quoteHost(String str)
|
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
// FIXME: unimplemented.
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Quote characters illegal in URI paths in given string.
|
|
|
|
*
|
|
|
|
* Replace illegal characters by encoding their UTF-8
|
|
|
|
* representation as "%" + hex code for each resulting
|
|
|
|
* UTF-8 character.
|
|
|
|
*
|
|
|
|
* @param str The string to quote
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
*
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
* @return The quoted string.
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
private static String quotePath(String str)
|
|
|
|
{
|
2004-03-21 10:54:46 +00:00
|
|
|
// Technically, we should be using RFC2396_PATH, but
|
|
|
|
// it contains no additional characters.
|
|
|
|
return quote(str, RFC2396_PATH_SEGMENTS);
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Quote characters illegal in URI user infos in given string.
|
|
|
|
*
|
|
|
|
* Replace illegal characters by encoding their UTF-8
|
|
|
|
* representation as "%" + hex code for each resulting
|
|
|
|
* UTF-8 character.
|
|
|
|
*
|
|
|
|
* @param str The string to quote
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
*
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
* @return The quoted string.
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
private static String quoteUserInfo(String str)
|
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
// FIXME: unimplemented.
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2002-10-05 07:49:08 +00:00
|
|
|
/**
|
|
|
|
* Creates an URI from the given string
|
|
|
|
*
|
|
|
|
* @param str The string to create the URI from
|
|
|
|
*
|
|
|
|
* @exception URISyntaxException If the given string violates RFC 2396
|
|
|
|
* @exception NullPointerException If str is null
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public URI(String str) throws URISyntaxException
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
2004-08-18 18:05:39 +00:00
|
|
|
this.string = str;
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
parseURI(str);
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
|
2002-10-05 07:49:08 +00:00
|
|
|
/**
|
|
|
|
* Create an URI from the given components
|
|
|
|
*
|
|
|
|
* @param scheme The scheme name
|
|
|
|
* @param userInfo The username and authorization info
|
|
|
|
* @param host The hostname
|
|
|
|
* @param port The port number
|
|
|
|
* @param path The path
|
|
|
|
* @param query The query
|
|
|
|
* @param fragment The fragment
|
|
|
|
*
|
|
|
|
* @exception URISyntaxException If the given string violates RFC 2396
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public URI(String scheme, String userInfo, String host, int port,
|
|
|
|
String path, String query, String fragment)
|
2002-10-05 07:49:08 +00:00
|
|
|
throws URISyntaxException
|
|
|
|
{
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
this((scheme == null ? "" : scheme + ":")
|
|
|
|
+ (userInfo == null && host == null && port == -1 ? "" : "//")
|
|
|
|
+ (userInfo == null ? "" : quoteUserInfo(userInfo) + "@")
|
|
|
|
+ (host == null ? "" : quoteHost(host))
|
|
|
|
+ (port == -1 ? "" : ":" + String.valueOf(port))
|
|
|
|
+ (path == null ? "" : quotePath(path))
|
|
|
|
+ (query == null ? "" : "?" + quote(query))
|
|
|
|
+ (fragment == null ? "" : "#" + quote(fragment)));
|
|
|
|
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
parseServerAuthority();
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Create an URI from the given components
|
|
|
|
*
|
|
|
|
* @param scheme The scheme name
|
|
|
|
* @param authority The authority
|
|
|
|
* @param path The apth
|
|
|
|
* @param query The query
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
* @param fragment The fragment
|
2002-10-05 07:49:08 +00:00
|
|
|
*
|
|
|
|
* @exception URISyntaxException If the given string violates RFC 2396
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public URI(String scheme, String authority, String path, String query,
|
|
|
|
String fragment) throws URISyntaxException
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
this((scheme == null ? "" : scheme + ":")
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
+ (authority == null ? "" : "//" + quoteAuthority(authority))
|
|
|
|
+ (path == null ? "" : quotePath(path))
|
|
|
|
+ (query == null ? "" : "?" + quote(query))
|
|
|
|
+ (fragment == null ? "" : "#" + quote(fragment)));
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Create an URI from the given components
|
|
|
|
*
|
|
|
|
* @param scheme The scheme name
|
|
|
|
* @param host The hostname
|
|
|
|
* @param path The path
|
|
|
|
* @param fragment The fragment
|
|
|
|
*
|
|
|
|
* @exception URISyntaxException If the given string violates RFC 2396
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public URI(String scheme, String host, String path, String fragment)
|
2002-10-05 07:49:08 +00:00
|
|
|
throws URISyntaxException
|
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
this(scheme, null, host, -1, path, null, fragment);
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Create an URI from the given components
|
|
|
|
*
|
|
|
|
* @param scheme The scheme name
|
|
|
|
* @param ssp The scheme specific part
|
|
|
|
* @param fragment The fragment
|
|
|
|
*
|
|
|
|
* @exception URISyntaxException If the given string violates RFC 2396
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public URI(String scheme, String ssp, String fragment)
|
2002-10-05 07:49:08 +00:00
|
|
|
throws URISyntaxException
|
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
this((scheme == null ? "" : scheme + ":")
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
+ (ssp == null ? "" : quote(ssp))
|
|
|
|
+ (fragment == null ? "" : "#" + quote(fragment)));
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Create an URI from the given string
|
|
|
|
*
|
|
|
|
* @param str The string to create the URI from
|
|
|
|
*
|
|
|
|
* @exception IllegalArgumentException If the given string violates RFC 2396
|
|
|
|
* @exception NullPointerException If str is null
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public static URI create(String str)
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
try
|
|
|
|
{
|
|
|
|
return new URI(str);
|
|
|
|
}
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
catch (URISyntaxException e)
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
{
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
throw (IllegalArgumentException) new IllegalArgumentException()
|
|
|
|
.initCause(e);
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
}
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Attempts to parse this URI's authority component, if defined,
|
|
|
|
* into user-information, host, and port components
|
|
|
|
*
|
|
|
|
* @exception URISyntaxException If the given string violates RFC 2396
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public URI parseServerAuthority() throws URISyntaxException
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a normalizes versions of the URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public URI normalize()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Resolves the given URI against this URI
|
|
|
|
*
|
|
|
|
* @param uri The URI to resolve against this URI
|
|
|
|
*
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
* @return The resulting URI, or null when it couldn't be resolved
|
|
|
|
* for some reason.
|
2002-10-05 07:49:08 +00:00
|
|
|
*
|
|
|
|
* @exception NullPointerException If uri is null
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public URI resolve(URI uri)
|
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
if (uri.isAbsolute())
|
|
|
|
return uri;
|
|
|
|
if (uri.isOpaque())
|
|
|
|
return uri;
|
|
|
|
|
|
|
|
String scheme = uri.getScheme();
|
|
|
|
String schemeSpecificPart = uri.getSchemeSpecificPart();
|
|
|
|
String authority = uri.getAuthority();
|
|
|
|
String path = uri.getPath();
|
|
|
|
String query = uri.getQuery();
|
|
|
|
String fragment = uri.getFragment();
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
if (fragment != null && path != null && path.equals("")
|
|
|
|
&& scheme == null && authority == null && query == null)
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
return new URI(this.scheme, this.schemeSpecificPart, fragment);
|
|
|
|
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
if (authority == null)
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
{
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
authority = this.authority;
|
|
|
|
if (path == null)
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
path = "";
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
if (! (path.startsWith("/")))
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
{
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
StringBuffer basepath = new StringBuffer(this.path);
|
|
|
|
int i = this.path.lastIndexOf('/');
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
if (i >= 0)
|
|
|
|
basepath.delete(i + 1, basepath.length());
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
basepath.append(path);
|
|
|
|
path = basepath.toString();
|
|
|
|
// FIXME We must normalize the path here.
|
|
|
|
// Normalization process omitted.
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
}
|
|
|
|
}
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
return new URI(this.scheme, authority, path, query, fragment);
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
}
|
|
|
|
catch (URISyntaxException e)
|
|
|
|
{
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
return null;
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
}
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Resolves the given URI string against this URI
|
|
|
|
*
|
|
|
|
* @param str The URI as string to resolve against this URI
|
|
|
|
*
|
|
|
|
* @return The resulting URI
|
|
|
|
*
|
|
|
|
* @exception IllegalArgumentException If the given URI string
|
|
|
|
* violates RFC 2396
|
|
|
|
* @exception NullPointerException If uri is null
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public URI resolve(String str) throws IllegalArgumentException
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
return resolve(create(str));
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Relativizes the given URI against this URI
|
|
|
|
*
|
|
|
|
* @param uri The URI to relativize this URI
|
|
|
|
*
|
|
|
|
* @return The resulting URI
|
|
|
|
*
|
|
|
|
* @exception NullPointerException If uri is null
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public URI relativize(URI uri)
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Creates an URL from an URI
|
|
|
|
*
|
|
|
|
* @exception MalformedURLException If a protocol handler for the URL could
|
|
|
|
* not be found, or if some other error occurred while constructing the URL
|
|
|
|
* @exception IllegalArgumentException If the URI is not absolute
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public URL toURL() throws IllegalArgumentException, MalformedURLException
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
if (isAbsolute())
|
|
|
|
return new URL(this.toString());
|
|
|
|
|
|
|
|
throw new IllegalArgumentException("not absolute");
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the scheme of the URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getScheme()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
|
|
|
return scheme;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tells whether this URI is absolute or not
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public boolean isAbsolute()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
BindException.java, [...]: Big import statement and @author tag cleanup.
2004-10-17 Michael Koch <konqueror@gmx.de>
* java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Big import statement and @author tag cleanup.
From-SVN: r89168
2004-10-17 08:29:57 +00:00
|
|
|
return scheme != null;
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tell whether this URI is opaque or not
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public boolean isOpaque()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
return ((scheme != null) && ! (schemeSpecificPart.startsWith("/")));
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the raw scheme specific part of this URI.
|
|
|
|
* The scheme-specific part is never undefined, though it may be empty
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getRawSchemeSpecificPart()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
2004-03-21 10:54:46 +00:00
|
|
|
return rawSchemeSpecificPart;
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the decoded scheme specific part of this URI.
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getSchemeSpecificPart()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
return schemeSpecificPart;
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the rae authority part of this URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getRawAuthority()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
2004-03-21 10:54:46 +00:00
|
|
|
return rawAuthority;
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the decoded authority part of this URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getAuthority()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
return authority;
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the raw user info part of this URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getRawUserInfo()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
2004-03-21 10:54:46 +00:00
|
|
|
return rawUserInfo;
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the decoded user info part of this URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getUserInfo()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
return userInfo;
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the hostname of the URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getHost()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
|
|
|
return host;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the port number of the URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public int getPort()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
|
|
|
return port;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the raw path part of this URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getRawPath()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
2004-03-21 10:54:46 +00:00
|
|
|
return rawPath;
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the path of the URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getPath()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
return path;
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the raw query part of this URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getRawQuery()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
2004-03-21 10:54:46 +00:00
|
|
|
return rawQuery;
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the query of the URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getQuery()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
return query;
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Return the raw fragment part of this URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getRawFragment()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
2004-03-21 10:54:46 +00:00
|
|
|
return rawFragment;
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the fragment of the URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String getFragment()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
return fragment;
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Compares the URI with a given object
|
|
|
|
*
|
|
|
|
* @param obj The obj to compare the URI with
|
|
|
|
*/
|
|
|
|
public boolean equals(Object obj)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Computes the hascode of the URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public int hashCode()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Compare the URI with another object that must be an URI too
|
|
|
|
*
|
|
|
|
* @param obj This object to compare this URI with
|
|
|
|
*
|
|
|
|
* @exception ClassCastException If given object ist not an URI
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public int compareTo(Object obj) throws ClassCastException
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the URI as string
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String toString()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
[multiple changes]
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java (toURL): Implemented.
2004-03-12 Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>
* java/net/URI.java
(URI_REGEXP) updated to contain scheme specific part.
(SCHEME_SPEC_PART_GROUP) new constant.
(AUTHORITY_GROUP, PATH_GROUP, QUERY_GROUP, FRAGMENT_GROUP)
updated to make room for SCHEME_SPEC_PART_GROUP.
(parseURI) parse scheme specific part.
(resolve, isAbsolute, isOpaque, getRawSchemeSpecificPart,
getSchemeSpecificPart, getAuthority, getUserInfo, getPath,
getQuery, getFragment) implemented.
2004-03-12 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/java/net/URI.java
partially implemented using java.util.regex.
(URI_REGEXP) new constant. Used to parse URIs.
(SCHEME_GROUP) new constant representing index of scheme group
in parsed URI.
(AUTHORITY_GROUP) new constant representing index of authority
group in parsed URI.
(PATH_GROUP) new constant representing index of path group in
parsed URI.
(QUERY_GROUP) new constant representing index of query group in
parsed URI.
(FRAGMENT_GROUP) new constant representing index of fragment
group in parsed URI.
(getURIGroup) new static utility method.
(parseURI) implemented.
(quote) stub for new static utility method.
(quoteAuthority) stub for new static utility method.
(quoteHost) stub for new static utility method.
(quotePath) stub for new static utility method.
(quoteUserInfo) stub for new static utility method.
(URI) implemented.
(create) don't throw URISyntaxException. Implemented.
(toString) implemented.
From-SVN: r79375
2004-03-12 08:15:54 +00:00
|
|
|
return (getScheme() == null ? "" : getScheme() + ":")
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
+ (getRawAuthority() == null ? "" : "//" + getRawAuthority())
|
|
|
|
+ (getRawPath() == null ? "" : getRawPath())
|
|
|
|
+ (getRawQuery() == null ? "" : "?" + getRawQuery())
|
|
|
|
+ (getRawFragment() == null ? "" : "#" + getRawFragment());
|
2002-10-05 07:49:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the URI as US-ASCII string
|
|
|
|
*/
|
Authenticator.java, [...]: Fixed javadocs, coding style and argument names all over.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/Authenticator.java,
java/net/BindException.java,
java/net/ConnectException.java,
java/net/ContentHandler.java,
java/net/ContentHandlerFactory.java,
java/net/DatagramPacket.java,
java/net/DatagramSocket.java,
java/net/DatagramSocketImpl.java,
java/net/DatagramSocketImplFactory.java,
java/net/FileNameMap.java,
java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
java/net/InetAddress.java,
java/net/InetSocketAddress.java,
java/net/JarURLConnection.java,
java/net/MalformedURLException.java,
java/net/MulticastSocket.java,
java/net/NetPermission.java,
java/net/NetworkInterface.java,
java/net/NoRouteToHostException.java,
java/net/PasswordAuthentication.java,
java/net/PortUnreachableException.java,
java/net/ProtocolException.java,
java/net/ServerSocket.java,
java/net/Socket.java,
java/net/SocketAddress.java,
java/net/SocketException.java,
java/net/SocketImpl.java,
java/net/SocketImplFactory.java,
java/net/SocketOptions.java,
java/net/SocketPermission.java,
java/net/SocketTimeoutException.java,
java/net/URI.java,
java/net/URISyntaxException.java,
java/net/URL.java,
java/net/URLClassLoader.java,
java/net/URLConnection.java,
java/net/URLDecoder.java,
java/net/URLEncoder.java,
java/net/URLStreamHandler.java,
java/net/URLStreamHandlerFactory.java,
java/net/UnknownHostException.java,
java/net/UnknownServiceException.java:
Fixed javadocs, coding style and argument names all over.
From-SVN: r80900
2004-04-20 13:05:10 +00:00
|
|
|
public String toASCIIString()
|
2002-10-05 07:49:08 +00:00
|
|
|
{
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
}
|