diff options
Diffstat (limited to 'libjava/gnu/java/net')
| -rw-r--r-- | libjava/gnu/java/net/protocol/file/Connection.java | 66 | ||||
| -rw-r--r-- | libjava/gnu/java/net/protocol/gcjlib/Connection.java | 19 | ||||
| -rw-r--r-- | libjava/gnu/java/net/protocol/jar/Connection.java | 52 |
3 files changed, 117 insertions, 20 deletions
diff --git a/libjava/gnu/java/net/protocol/file/Connection.java b/libjava/gnu/java/net/protocol/file/Connection.java index 650d9f21853..4da6e882c00 100644 --- a/libjava/gnu/java/net/protocol/file/Connection.java +++ b/libjava/gnu/java/net/protocol/file/Connection.java @@ -50,6 +50,9 @@ import java.net.ProtocolException; import java.net.URL; import java.net.URLConnection; import java.security.Permission; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; /** * This subclass of java.net.URLConnection models a URLConnection via @@ -62,9 +65,11 @@ import java.security.Permission; public class Connection extends URLConnection { /** - * Default permission for a file + * HTTP-style DateFormat, used to format the last-modified header. */ - private static final String DEFAULT_PERMISSION = "read"; + private static SimpleDateFormat dateFormat + = new SimpleDateFormat("EEE, dd MMM yyyy hh:mm:ss 'GMT'", + new Locale ("En", "Us", "Unix")); /** * This is a File object for this connection @@ -82,18 +87,11 @@ public class Connection extends URLConnection private OutputStream outputStream; /** - * FilePermission to read the file - */ - private FilePermission permission; - - /** * Calls superclass constructor to initialize. */ public Connection(URL url) { super (url); - - permission = new FilePermission(getURL().getFile(), DEFAULT_PERMISSION); } /** @@ -156,45 +154,73 @@ public class Connection extends URLConnection } /** - * Get the last modified time of the resource. - * - * @return the time since epoch that the resource was modified. + * Get an http-style header field. Just handle a few common ones. */ - public long getLastModified() + public String getHeaderField(String field) { try { if (!connected) connect(); - return file.lastModified(); + if (field.equals("content-type")) + return guessContentTypeFromName(file.getName()); + else if (field.equals("content-length")) + return Long.toString(file.length()); + else if (field.equals("last-modified")) + { + synchronized (dateFormat) + { + return dateFormat.format(new Date(file.lastModified())); + } + } } catch (IOException e) { - return -1; + // Fall through. } + return null; } /** * Get the length of content. - * * @return the length of the content. */ public int getContentLength() { try { + if (!connected) + connect(); + + return (int) file.length(); + } + catch (IOException e) + { + return -1; + } + } + + /** + * Get the last modified time of the resource. + * + * @return the time since epoch that the resource was modified. + */ + public long getLastModified() + { + try + { if (!connected) connect(); - - return (int) file.length(); + + return file.lastModified(); } catch (IOException e) { return -1; } } - + /** * This method returns a <code>Permission</code> object representing the * permissions required to access this URL. This method returns a @@ -205,6 +231,6 @@ public class Connection extends URLConnection */ public Permission getPermission() throws IOException { - return permission; + return new FilePermission(getURL().getFile(), "read"); } } diff --git a/libjava/gnu/java/net/protocol/gcjlib/Connection.java b/libjava/gnu/java/net/protocol/gcjlib/Connection.java index b31db565776..4e6e462f26e 100644 --- a/libjava/gnu/java/net/protocol/gcjlib/Connection.java +++ b/libjava/gnu/java/net/protocol/gcjlib/Connection.java @@ -61,4 +61,23 @@ class Connection extends URLConnection connect(); return new CoreInputStream(core); } + + public String getHeaderField(String field) + { + try + { + if (!connected) + connect(); + + if (field.equals("content-type")) + return guessContentTypeFromName(name); + else if (field.equals("content-length")) + return Long.toString(core.length); + } + catch (IOException e) + { + // Fall through. + } + return null; + } } diff --git a/libjava/gnu/java/net/protocol/jar/Connection.java b/libjava/gnu/java/net/protocol/jar/Connection.java index 04eb3fe3715..9ba2e3fd1ff 100644 --- a/libjava/gnu/java/net/protocol/jar/Connection.java +++ b/libjava/gnu/java/net/protocol/jar/Connection.java @@ -49,8 +49,11 @@ import java.net.MalformedURLException; import java.net.ProtocolException; import java.net.URL; import java.net.URLConnection; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.HashMap; import java.util.Hashtable; +import java.util.Locale; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.JarInputStream; @@ -66,6 +69,14 @@ import java.util.zip.ZipFile; public final class Connection extends JarURLConnection { private static Hashtable file_cache = new Hashtable(); + + /** + * HTTP-style DateFormat, used to format the last-modified header. + */ + private static SimpleDateFormat dateFormat + = new SimpleDateFormat("EEE, dd MMM yyyy hh:mm:ss 'GMT'", + new Locale ("En", "Us", "Unix")); + private JarFile jar_file; /** @@ -219,6 +230,32 @@ public final class Connection extends JarURLConnection return jar_file; } + public String getHeaderField(String field) + { + try + { + if (!connected) + connect(); + + if (field.equals("content-type")) + return guessContentTypeFromName(getJarEntry().getName()); + else if (field.equals("content-length")) + return Long.toString(getJarEntry().getSize()); + else if (field.equals("last-modified")) + { + synchronized (dateFormat) + { + return dateFormat.format(new Date(getJarEntry().getTime())); + } + } + } + catch (IOException e) + { + // Fall through. + } + return null; + } + public int getContentLength() { if (!connected) @@ -233,4 +270,19 @@ public final class Connection extends JarURLConnection return -1; } } + + public long getLastModified() + { + if (!connected) + return -1; + + try + { + return getJarEntry().getTime(); + } + catch (IOException e) + { + return -1; + } + } } |
