Index: java/net/URI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URI.java,v
retrieving revision 1.11
diff -u -3 -p -u -r1.11 URI.java
--- java/net/URI.java 7 Mar 2005 13:48:11 -0000 1.11
+++ java/net/URI.java 16 Apr 2005 12:18:00 -0000
@@ -46,12 +46,67 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
+ *
+ * A URI instance represents that defined by
+ * RFC2396,
+ * with some deviations.
+ *
+ *
+ * At its highest level, a URI consists of:
+ *
+ * [scheme:]scheme-specific-part
+ * [#fragment]
+ *
+ *
+ * where # and : are literal characters,
+ * and those parts enclosed in square brackets are optional.
+ *
+ *
+ * There are two main types of URI. An opaque URI is one
+ * which just consists of the above three parts, and is not further
+ * defined. An example of such a URI would be mailto: URI.
+ * In contrast, hierarchical URIs give further definition
+ * to the scheme-specific part, so as represent some part of a hierarchical
+ * structure.
+ *
+ *
+ * [//authority][path]
+ * [?query]
+ *
+ *
+ * with / and ? being literal characters.
+ * When server-based, the authority section is further subdivided into:
+ *
+ *
+ * [user-info@]host
+ * [:port]
+ *
+ *
+ * with @ and : as literal characters.
+ * Authority sections that are not server-based are said to be registry-based.
+ *
+ *
+ * Hierarchical URIs can be either relative or absolute. Absolute URIs
+ * always start with a `/', while relative URIs don't
+ * specify a scheme. Opaque URIs are always absolute.
+ *
+ *
+ * Each part of the URI may have one of three states: undefined, empty
+ * or containing some content. The former two of these are represented
+ * by null
and the empty string in Java, respectively.
+ * The scheme-specific part may never be undefined. It also follows from
+ * this that the path sub-part may also not be undefined, so as to ensure
+ * the former.
+ *
+ *
* @author Ito Kazumitsu (address@hidden)
* @author Dalibor Topic (address@hidden)
* @author Michael Koch (address@hidden)
+ * @author Andrew John Hughes (address@hidden)
* @since 1.4
*/
-public final class URI implements Comparable, Serializable
+public final class URI
+ implements Comparable, Serializable
{
static final long serialVersionUID = -6052424284110960213L;
@@ -180,10 +235,14 @@ public final class URI implements Compar
if (matcher.matches())
{
scheme = getURIGroup(matcher, SCHEME_GROUP);
- rawSchemeSpecificPart = getURIGroup(matcher, SCHEME_SPEC_PART_GROUP);
- rawAuthority = getURIGroup(matcher, AUTHORITY_GROUP);
- rawPath = getURIGroup(matcher, PATH_GROUP);
- rawQuery = getURIGroup(matcher, QUERY_GROUP);
+ rawSchemeSpecificPart = matcher.group(SCHEME_SPEC_PART_GROUP);
+ schemeSpecificPart = unquote(rawSchemeSpecificPart);
+ if (!isOpaque())
+ {
+ rawAuthority = getURIGroup(matcher, AUTHORITY_GROUP);
+ rawPath = matcher.group(PATH_GROUP);
+ rawQuery = getURIGroup(matcher, QUERY_GROUP);
+ }
rawFragment = getURIGroup(matcher, FRAGMENT_GROUP);
}
else
@@ -221,7 +280,6 @@ public final class URI implements Compar
// We must eagerly unquote the parts, because this is the only time
// we may throw an exception.
- schemeSpecificPart = unquote(rawSchemeSpecificPart);
authority = unquote(rawAuthority);
userInfo = unquote(rawUserInfo);
host = unquote(rawHost);
@@ -814,14 +872,15 @@ public final class URI implements Compar
}
/**
- * Returns the URI as string
+ * Returns the URI as a String. If the URI was created using a constructor,
+ * then this will be the same as the original input string.
+ *
+ * @return a string representation of the URI.
*/
public String toString()
{
return (getScheme() == null ? "" : getScheme() + ":")
- + (getRawAuthority() == null ? "" : "//" + getRawAuthority())
- + (getRawPath() == null ? "" : getRawPath())
- + (getRawQuery() == null ? "" : "?" + getRawQuery())
+ + getRawSchemeSpecificPart()
+ (getRawFragment() == null ? "" : "#" + getRawFragment());
}