* This is the default value that will be used to determine whether or
* not user interaction should be allowed.
*/
- private static boolean defaultAllowUserInteraction = false;
+ private static boolean defaultAllowUserInteraction;
/**
* This is the default flag indicating whether or not to use caches to
* Indicates whether or not a connection has been established to the
* destination specified in the URL
*/
- protected boolean connected = false;
+ protected boolean connected;
/**
* Indicates whether or not input can be read from this URL
/**
* Indicates whether or not output can be sent to this URL
*/
- protected boolean doOutput = false;
+ protected boolean doOutput;
/**
* If this flag is set, the protocol is allowed to cache data whenever
* modified more recently than the date set in this variable. That date
* should be specified as the number of seconds since 1/1/1970 GMT.
*/
- protected long ifModifiedSince = 0L;
+ protected long ifModifiedSince;
/**
* This is the URL associated with this connection
protected URL url;
private static Hashtable handlers = new Hashtable();
- private static SimpleDateFormat dateFormat1, dateFormat2, dateFormat3;
- private static boolean dateformats_initialized = false;
+ private static SimpleDateFormat dateFormat1;
+ private static SimpleDateFormat dateFormat2;
+ private static SimpleDateFormat dateFormat3;
+ private static boolean dateformats_initialized;
/**
* Creates a URL connection to a given URL. A real connection is not made.
String type = getContentType();
ContentHandler ch = setContentHandler(type);
- if (ch == null)
- return getInputStream();
+ if (ch != null)
+ return ch.getContent(this);
- return ch.getContent(this);
+ return getInputStream();
}
/**
int port = url.getPort();
String file = url.getFile();
String ref = url.getRef();
+ String userInfo = url.getUserInfo();
+ String authority = url.getAuthority();
+ String query = null;
+
+ // On Windows we need to change \ to / for file URLs
+ if (url.getProtocol().equals("file"))
+ spec = spec.replace(File.separatorChar, '/');
if (spec.regionMatches(start, "//", 0, 2))
{
else
hostEnd = end;
- host = spec.substring(start, hostEnd);
+ authority = host = spec.substring(start, hostEnd);
// We first need a genuine host name (with userinfo).
// So we check for '@': if it's present check the port in the
// section after '@' in the other case check it in the full string.
// P.S.: We don't care having '@' at the beginning of the string.
if ((at_host = host.indexOf('@')) >= 0)
- genuineHost = host.substring(at_host);
+ {
+ genuineHost = host.substring(at_host);
+ userInfo = host.substring(0, at_host);
+ }
else
genuineHost = host;
else if (start < end)
{
// Context is available, but only override it if there is a new file.
- char sepChar = '/';
- int lastSlash = file.lastIndexOf(sepChar);
- if (lastSlash < 0 && File.separatorChar != sepChar
- && url.getProtocol().equals("file"))
- {
- // On Windows, even '\' is allowed in a "file" URL.
- sepChar = File.separatorChar;
- lastSlash = file.lastIndexOf(sepChar);
- }
+ int lastSlash = file.lastIndexOf('/');
file =
- file.substring(0, lastSlash) + sepChar + spec.substring(start, end);
+ file.substring(0, lastSlash) + '/' + spec.substring(start, end);
if (url.getProtocol().equals("file"))
{
{
boolean endsWithSlash = file.charAt(file.length() - 1) == '/';
file = new File(file).getCanonicalPath();
+ file = file.replace(File.separatorChar, '/');
if (endsWithSlash && file.charAt(file.length() - 1) != '/')
file += '/';
}
}
}
+ // We care about the query tag only if there is no reference at all.
+ if (ref == null)
+ {
+ int queryTag = file.indexOf('?');
+ if (queryTag != -1)
+ {
+ query = file.substring(queryTag + 1);
+ file = file.substring(0, queryTag);
+ }
+ }
+
// XXX - Classpath used to call PlatformHelper.toCanonicalForm() on
// the file part. It seems like overhead, but supposedly there is some
// benefit in windows based systems (it also lowercased the string).
- setURL(url, url.getProtocol(), host, port, file, ref);
+ setURL(url, url.getProtocol(), host, port, authority, userInfo, file, query, ref);
}
/*
String file;
String ref;
String user;
+ String authority;
int port;
protocol = url.getProtocol();
-
- // JDK 1.2 online doc infers that host could be null because it
- // explicitly states that file cannot be null, but is silent on host.
- host = url.getHost();
- if (host == null)
- host = "";
-
- port = url.getPort();
+ authority = url.getAuthority();
+ if (authority == null)
+ authority = "";
+
file = url.getFile();
ref = url.getRef();
- user = url.getUserInfo();
// Guess a reasonable size for the string buffer so we have to resize
// at most once.
- int size = protocol.length() + host.length() + file.length() + 24;
+ int size = protocol.length() + authority.length() + file.length() + 24;
StringBuffer sb = new StringBuffer(size);
- if (protocol.length() != 0)
+ if (protocol != null && protocol.length() > 0)
{
sb.append(protocol);
sb.append(":");
}
-
- if (host.length() != 0)
+
+ if (authority.length() != 0)
{
- sb.append("//");
- if (user != null && ! "".equals(user))
- sb.append(user).append('@');
- sb.append(host);
-
- // Append port if port was in URL spec.
- if (port >= 0)
- sb.append(':').append(port);
+ sb.append("//").append(authority);
}
sb.append(file);
projects / gcc.git / commitdiff